summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation/automation_proxy.cc
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 22:09:03 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 22:09:03 +0000
commit95c3c59d275042225cda4589525cb279f66f1f2c (patch)
treef9fc3164096b65db04c60060a882bf68e7d5d7df /chrome/test/automation/automation_proxy.cc
parent7d7b882f49e7c33e1ad7b113234fd6af94fac608 (diff)
downloadchromium_src-95c3c59d275042225cda4589525cb279f66f1f2c.zip
chromium_src-95c3c59d275042225cda4589525cb279f66f1f2c.tar.gz
chromium_src-95c3c59d275042225cda4589525cb279f66f1f2c.tar.bz2
Remove the defunct SetAccelerator message and replace it with an
automation message to set initial settings. BUG=none TEST=none Review URL: http://codereview.chromium.org/155376 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/automation_proxy.cc')
-rw-r--r--chrome/test/automation/automation_proxy.cc19
1 files changed, 9 insertions, 10 deletions
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 2d4fe5b..a1df2d8 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -496,17 +496,13 @@ bool AutomationProxy::OpenNewBrowserWindow(bool show) {
return Send(new AutomationMsg_OpenNewBrowserWindow(0, show));
}
-#if defined(OS_WIN)
-// TODO(port): Replace HWNDs.
-scoped_refptr<TabProxy> AutomationProxy::CreateExternalTab(HWND parent,
- const gfx::Rect& dimensions, unsigned int style, bool incognito,
- HWND* external_tab_container, HWND* tab) {
- IPC::Message* response = NULL;
+scoped_refptr<TabProxy> AutomationProxy::CreateExternalTab(
+ const IPC::ExternalTabSettings& settings,
+ gfx::NativeWindow* external_tab_container,
+ gfx::NativeWindow* tab) {
int handle = 0;
-
bool succeeded =
- Send(new AutomationMsg_CreateExternalTab(0, parent, dimensions, style,
- incognito,
+ Send(new AutomationMsg_CreateExternalTab(0, settings,
external_tab_container,
tab,
&handle));
@@ -514,11 +510,14 @@ scoped_refptr<TabProxy> AutomationProxy::CreateExternalTab(HWND parent,
return NULL;
}
+#if defined(OS_WIN)
DCHECK(IsWindow(*external_tab_container));
+#else // defined(OS_WIN)
+ DCHECK(*external_tab_container);
+#endif // defined(OS_WIN)
DCHECK(tracker_->GetResource(handle) == NULL);
return new TabProxy(this, tracker_.get(), handle);
}
-#endif // defined(OS_WIN)
template <class T> scoped_refptr<T> AutomationProxy::ProxyObjectFromHandle(
int handle) {