diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 23:50:55 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 23:50:55 +0000 |
| commit | 09faf946bd8464b1b09298b5ec7fc598a42ab360 (patch) | |
| tree | a5208c05368976323009010b029cc1c83fe2ac71 /ash/wm/panels | |
| parent | b9f658bcccdd6b94e4820a61b81c2fd12a51ad59 (diff) | |
| download | chromium_src-09faf946bd8464b1b09298b5ec7fc598a42ab360.zip chromium_src-09faf946bd8464b1b09298b5ec7fc598a42ab360.tar.gz chromium_src-09faf946bd8464b1b09298b5ec7fc598a42ab360.tar.bz2 | |
Move the logic to update bounds for show type from WorkspaceLayoutManager to DefaultState
* Introduced WindowStateObserver::{Pre|Post}WindowShowTypeChange
We had implicit dependency between OnWindowShowTypeChanged implementations. This clearly separate the things that should happen before and after the window's bounds is updated.
This is another step to introduce state machine.
BUG=318325
TEST=no functional change. all tests should pass.
TBR=benwells@chromium.org
Review URL: https://codereview.chromium.org/149303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/panels')
| -rw-r--r-- | ash/wm/panels/panel_layout_manager.cc | 2 | ||||
| -rw-r--r-- | ash/wm/panels/panel_layout_manager.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index 7bfe4ad..cc521f4 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -459,7 +459,7 @@ void PanelLayoutManager::OnShelfAlignmentChanged(aura::Window* root_window) { ///////////////////////////////////////////////////////////////////////////// // PanelLayoutManager, WindowObserver implementation: -void PanelLayoutManager::OnWindowShowTypeChanged( +void PanelLayoutManager::OnPostWindowShowTypeChange( wm::WindowState* window_state, wm::WindowShowType old_type) { // If the shelf is currently hidden then windows will not actually be shown diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h index 407cbcb..058fa39 100644 --- a/ash/wm/panels/panel_layout_manager.h +++ b/ash/wm/panels/panel_layout_manager.h @@ -97,8 +97,8 @@ class ASH_EXPORT PanelLayoutManager virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE; // Overridden from ash::wm::WindowStateObserver - virtual void OnWindowShowTypeChanged(wm::WindowState* window_state, - wm::WindowShowType old_type) OVERRIDE; + virtual void OnPostWindowShowTypeChange(wm::WindowState* window_state, + wm::WindowShowType old_type) OVERRIDE; // Overridden from aura::WindowObserver virtual void OnWindowVisibilityChanged(aura::Window* window, |