summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame_automation.cc9
-rw-r--r--chrome_frame/chrome_frame_automation.h5
-rw-r--r--chrome_frame/custom_sync_call_context.h6
3 files changed, 12 insertions, 8 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 257e20b..33ab786 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -484,7 +484,7 @@ bool ChromeFrameAutomationClient::Initialize(
ui_thread_id_ = PlatformThread::CurrentId();
#ifndef NDEBUG
// In debug mode give more time to work with a debugger.
- if (0 && IsDebuggerPresent()) {
+ if (IsDebuggerPresent()) {
// Don't use INFINITE (which is -1) or even MAXINT since we will convert
// from milliseconds to microseconds when stored in a base::TimeDelta,
// thus * 1000. An hour should be enough.
@@ -813,13 +813,13 @@ void ChromeFrameAutomationClient::CreateExternalTab() {
this);
}
-void ChromeFrameAutomationClient::CreateExternalTabComplete(HWND chrome_window,
- HWND tab_window, int tab_handle) {
+AutomationLaunchResult ChromeFrameAutomationClient::CreateExternalTabComplete(
+ HWND chrome_window, HWND tab_window, int tab_handle) {
if (!automation_server_) {
// If we receive this notification while shutting down, do nothing.
DLOG(ERROR) << "CreateExternalTabComplete called when automation server "
<< "was null!";
- return;
+ return AUTOMATION_CREATE_TAB_FAILED;
}
AutomationLaunchResult launch_result = AUTOMATION_SUCCESS;
@@ -832,6 +832,7 @@ void ChromeFrameAutomationClient::CreateExternalTabComplete(HWND chrome_window,
tab_->AddObserver(this);
tab_handle_ = tab_handle;
}
+ return launch_result;
}
void ChromeFrameAutomationClient::SetEnableExtensionAutomation(
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 78e1d30..7b9b774 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -282,8 +282,9 @@ class ChromeFrameAutomationClient
virtual void OnChannelError(TabProxy* tab);
void CreateExternalTab();
- void CreateExternalTabComplete(HWND chrome_window, HWND tab_window,
- int tab_handle);
+ AutomationLaunchResult CreateExternalTabComplete(HWND chrome_window,
+ HWND tab_window,
+ int tab_handle);
// Called in UI thread. Here we fire event to the client notifying for
// the result of Initialize() method call.
void InitializeComplete(AutomationLaunchResult result);
diff --git a/chrome_frame/custom_sync_call_context.h b/chrome_frame/custom_sync_call_context.h
index c9242d6..28812ef 100644
--- a/chrome_frame/custom_sync_call_context.h
+++ b/chrome_frame/custom_sync_call_context.h
@@ -90,12 +90,14 @@ class CreateExternalTabContext
}
void Completed(HWND chrome_window, HWND tab_window, int tab_handle) {
- client_->CreateExternalTabComplete(chrome_window, tab_window, tab_handle);
+ AutomationLaunchResult launch_result =
+ client_->CreateExternalTabComplete(chrome_window, tab_window,
+ tab_handle);
client_->PostTask(FROM_HERE,
NewRunnableMethod(
client_.get(),
&ChromeFrameAutomationClient::InitializeComplete,
- AUTOMATION_SUCCESS));
+ launch_result));
}
private: