diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 21:35:29 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 21:35:29 +0000 |
| commit | a6a7434cda3fefc4a6852566640c2478e914d071 (patch) | |
| tree | e251eff26dbb4fa8e0d97cbc9c7670741285fe53 /chrome/test/automation/automation_proxy.h | |
| parent | a4a0080f76c8c6a8b59ad0dd17369977090f4a7e (diff) | |
| download | chromium_src-a6a7434cda3fefc4a6852566640c2478e914d071.zip chromium_src-a6a7434cda3fefc4a6852566640c2478e914d071.tar.gz chromium_src-a6a7434cda3fefc4a6852566640c2478e914d071.tar.bz2 | |
Revert 178043
Which reverted 178037, because now android does not include automation
as of r178375
> Revert 178037
>
> It broke android.
>
> > Fix official builder compile error when building aura on windows
> >
> > The error is in the chrome_frame_common project
> > chrome_frame_automation.cc (833) : error C2440: '=' cannot convert from HWND to gfx::NativeWindow
> >
> > That is because in aura the gfx::NativeWindow is a aura::Window* instead of HWND
> >
> > BUG=171018
> > TEST=see bug
> > Review URL: https://codereview.chromium.org/12022038
>
> TBR=cpu@chromium.org
> Review URL: https://codereview.chromium.org/12035027
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/11803003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/automation_proxy.h')
| -rw-r--r-- | chrome/test/automation/automation_proxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index 7f426cc..83cc165 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -186,8 +186,8 @@ class AutomationProxy : public IPC::Listener, public AutomationMessageSender { // that can be reparented in another process. scoped_refptr<TabProxy> CreateExternalTab( const ExternalTabSettings& settings, - gfx::NativeWindow* external_tab_container, - gfx::NativeWindow* tab); + gfx::AcceleratedWidget* external_tab_container, + gfx::AcceleratedWidget* tab); base::TimeDelta action_timeout() const { return action_timeout_; |