diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 19:00:31 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 19:00:31 +0000 |
| commit | 8fda621a0b9574a72a60c38a71a77be78d26196f (patch) | |
| tree | a77b7464ff3b6921071918dbb642895347cbe1c6 /chrome/common/automation_messages.h | |
| parent | d708ae170964afefadafdaf1e5428595ff6bc976 (diff) | |
| download | chromium_src-8fda621a0b9574a72a60c38a71a77be78d26196f.zip chromium_src-8fda621a0b9574a72a60c38a71a77be78d26196f.tar.gz chromium_src-8fda621a0b9574a72a60c38a71a77be78d26196f.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/automation_messages.h')
| -rw-r--r-- | chrome/common/automation_messages.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h index 3b2a6a9..0a011ce 100644 --- a/chrome/common/automation_messages.h +++ b/chrome/common/automation_messages.h @@ -54,7 +54,7 @@ IPC_STRUCT_BEGIN(AutomationURLResponse) IPC_STRUCT_END() IPC_STRUCT_BEGIN(ExternalTabSettings) - IPC_STRUCT_MEMBER(gfx::AcceleratedWidget, parent) + IPC_STRUCT_MEMBER(gfx::NativeWindow, parent) IPC_STRUCT_MEMBER(gfx::Rect, dimensions) IPC_STRUCT_MEMBER(unsigned int, style) IPC_STRUCT_MEMBER(bool, is_incognito) |