equal
deleted
inserted
replaced
15 import java.util.logging.Level; |
15 import java.util.logging.Level; |
16 import java.util.logging.Logger; |
16 import java.util.logging.Logger; |
17 |
17 |
18 import org.chromium.sdk.Browser; |
18 import org.chromium.sdk.Browser; |
19 import org.chromium.sdk.BrowserTab; |
19 import org.chromium.sdk.BrowserTab; |
20 import org.chromium.sdk.ChromiumIOException; |
|
21 import org.chromium.sdk.TabDebugEventListener; |
20 import org.chromium.sdk.TabDebugEventListener; |
22 import org.chromium.sdk.UnsupportedVersionException; |
21 import org.chromium.sdk.UnsupportedVersionException; |
23 import org.chromium.sdk.Version; |
22 import org.chromium.sdk.Version; |
24 import org.chromium.sdk.internal.tools.ToolHandler; |
23 import org.chromium.sdk.internal.tools.ToolHandler; |
25 import org.chromium.sdk.internal.tools.ToolName; |
24 import org.chromium.sdk.internal.tools.ToolName; |
101 |
100 |
102 String serverVersionString; |
101 String serverVersionString; |
103 try { |
102 try { |
104 serverVersionString = devToolsHandler.version(OPERATION_TIMEOUT_MS); |
103 serverVersionString = devToolsHandler.version(OPERATION_TIMEOUT_MS); |
105 } catch (TimeoutException e) { |
104 } catch (TimeoutException e) { |
106 throw new ChromiumIOException("Failed to get protocol version from remote", e); |
105 throw JavascriptVmImpl.newIOException("Failed to get protocol version from remote", e); |
107 } |
106 } |
108 if (serverVersionString == null) { |
107 if (serverVersionString == null) { |
109 throw new UnsupportedVersionException(BrowserImpl.PROTOCOL_VERSION, null); |
108 throw new UnsupportedVersionException(BrowserImpl.PROTOCOL_VERSION, null); |
110 } |
109 } |
111 Version serverVersion = Version.parseString(serverVersionString); |
110 Version serverVersion = Version.parseString(serverVersionString); |
290 SessionManager.Ticket<Session> ticket; |
289 SessionManager.Ticket<Session> ticket; |
291 try { |
290 try { |
292 ticket = connectInternal(); |
291 ticket = connectInternal(); |
293 } catch (UnsupportedVersionException e) { |
292 } catch (UnsupportedVersionException e) { |
294 // This exception should have happened on tab fetcher creation. |
293 // This exception should have happened on tab fetcher creation. |
295 throw new ChromiumIOException("Unexpected version problem", e); |
294 throw JavascriptVmImpl.newIOException("Unexpected version problem", e); |
296 } |
295 } |
297 |
296 |
298 Session session = ticket.getSession(); |
297 Session session = ticket.getSession(); |
299 |
298 |
300 BrowserTabImpl browserTab = null; |
299 BrowserTabImpl browserTab = null; |