diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 04:16:39 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 04:16:39 +0000 |
| commit | eb422129453c349708cf9086a96034f0cc024be7 (patch) | |
| tree | 01398a86f0ec05b616e7f57dbee1d16a25f2e633 /ui | |
| parent | cdf1f28c8ebec974caec3858b46d9f806040c48b (diff) | |
| download | chromium_src-eb422129453c349708cf9086a96034f0cc024be7.zip chromium_src-eb422129453c349708cf9086a96034f0cc024be7.tar.gz chromium_src-eb422129453c349708cf9086a96034f0cc024be7.tar.bz2 | |
Update Ash Display when resizing Metro window
On a window sizing event from the metro viewer, we were previously
only updating the aura root window. We also need to update the
ash DisplayManager data so that the wallpaper and docking behaviour
work correctly when going e.g. from a portrait display to a
landscape display.
R=ananta@chromium.org, sky@chromium.org
BUG=306629, 319051
Review URL: https://codereview.chromium.org/102783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/remote_root_window_host_win.cc | 11 | ||||
| -rw-r--r-- | ui/aura/remote_root_window_host_win.h | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_root_window_host_win.cc index 7097e3d2..ff52d07 100644 --- a/ui/aura/remote_root_window_host_win.cc +++ b/ui/aura/remote_root_window_host_win.cc @@ -182,8 +182,6 @@ bool RemoteRootWindowHostWin::OnMessageReceived(const IPC::Message& message) { OnSelectFolderDone) IPC_MESSAGE_HANDLER(MetroViewerHostMsg_SetCursorPosAck, OnSetCursorPosAck) - IPC_MESSAGE_HANDLER(MetroViewerHostMsg_WindowSizeChanged, - OnWindowSizeChanged) IPC_MESSAGE_HANDLER(MetroViewerHostMsg_ActivateDesktopDone, OnDesktopActivated) IPC_MESSAGE_UNHANDLED(handled = false) @@ -295,6 +293,11 @@ void RemoteRootWindowHostWin::HandleSelectFolder( host_->Send(new MetroViewerHostMsg_DisplaySelectFolder(title)); } +void RemoteRootWindowHostWin::HandleWindowSizeChanged(uint32 width, + uint32 height) { + SetBounds(gfx::Rect(0, 0, width, height)); +} + bool RemoteRootWindowHostWin::IsForegroundWindow() { return ::GetForegroundWindow() == remote_window_; } @@ -572,10 +575,6 @@ void RemoteRootWindowHostWin::OnSetCursorPosAck() { ignore_mouse_moves_until_set_cursor_ack_ = false; } -void RemoteRootWindowHostWin::OnWindowSizeChanged(uint32 width, uint32 height) { - SetBounds(gfx::Rect(0, 0, width, height)); -} - void RemoteRootWindowHostWin::OnDesktopActivated() { ActivateDesktopCompleted temp = activate_completed_callback_; activate_completed_callback_.Reset(); diff --git a/ui/aura/remote_root_window_host_win.h b/ui/aura/remote_root_window_host_win.h index 437d409..b7d9148 100644 --- a/ui/aura/remote_root_window_host_win.h +++ b/ui/aura/remote_root_window_host_win.h @@ -139,6 +139,8 @@ class AURA_EXPORT RemoteRootWindowHostWin : public RootWindowHost { const SelectFolderCompletion& on_success, const FileSelectionCanceled& on_failure); + void HandleWindowSizeChanged(uint32 width, uint32 height); + // Returns the active ASH root window. Window* GetAshWindow(); @@ -181,7 +183,6 @@ class AURA_EXPORT RemoteRootWindowHostWin : public RootWindowHost { const std::vector<base::FilePath>& files); void OnSelectFolderDone(bool success, const base::FilePath& folder); void OnSetCursorPosAck(); - void OnWindowSizeChanged(uint32 width, uint32 height); void OnDesktopActivated(); // RootWindowHost overrides: |