diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 19:33:50 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 19:33:50 +0000 |
| commit | f4bb9fded21dd5595e4d8da54ad2ab4b91ef7e49 (patch) | |
| tree | bd95d23d19b05670229330197ae5e067ea4297dc /ash/wm/shelf_layout_manager.cc | |
| parent | 688ee168aaeafcf9b7417841a3cf9fee4f47f4af (diff) | |
| download | chromium_src-f4bb9fded21dd5595e4d8da54ad2ab4b91ef7e49.zip chromium_src-f4bb9fded21dd5595e4d8da54ad2ab4b91ef7e49.tar.gz chromium_src-f4bb9fded21dd5595e4d8da54ad2ab4b91ef7e49.tar.bz2 | |
Changes all non-workspace code to talk to WorkspaceManager via
WorkspaceController. This is a precursor to making WorkspaceManager
an interface and adding a new WorkspaceManager variant for the new
window heurisics.
BUG=137342
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10852003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shelf_layout_manager.cc')
| -rw-r--r-- | ash/wm/shelf_layout_manager.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc index 717425d..81d6e39 100644 --- a/ash/wm/shelf_layout_manager.cc +++ b/ash/wm/shelf_layout_manager.cc @@ -14,7 +14,7 @@ #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray.h" #include "ash/system/web_notification/web_notification_tray.h" -#include "ash/wm/workspace/workspace_manager.h" +#include "ash/wm/workspace_controller.h" #include "base/auto_reset.h" #include "base/i18n/rtl.h" #include "ui/aura/client/activation_client.h" @@ -129,7 +129,7 @@ ShelfLayoutManager::ShelfLayoutManager(views::Widget* status) alignment_(SHELF_ALIGNMENT_BOTTOM), launcher_(NULL), status_(status), - workspace_manager_(NULL), + workspace_controller_(NULL), window_overlaps_shelf_(false) { Shell::GetInstance()->AddShellObserver(this); aura::client::GetActivationClient(root_window_)->AddObserver(this); @@ -231,24 +231,23 @@ void ShelfLayoutManager::UpdateVisibilityState() { if (delegate && delegate->IsScreenLocked()) { SetState(VISIBLE); } else { - WorkspaceManager::WindowState window_state( - workspace_manager_->GetWindowState()); + WorkspaceWindowState window_state(workspace_controller_->GetWindowState()); switch (window_state) { - case WorkspaceManager::WINDOW_STATE_FULL_SCREEN: + case WORKSPACE_WINDOW_STATE_FULL_SCREEN: SetState(HIDDEN); break; - case WorkspaceManager::WINDOW_STATE_MAXIMIZED: + case WORKSPACE_WINDOW_STATE_MAXIMIZED: SetState(auto_hide_behavior_ != SHELF_AUTO_HIDE_BEHAVIOR_NEVER ? AUTO_HIDE : VISIBLE); break; - case WorkspaceManager::WINDOW_STATE_WINDOW_OVERLAPS_SHELF: - case WorkspaceManager::WINDOW_STATE_DEFAULT: + case WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF: + case WORKSPACE_WINDOW_STATE_DEFAULT: SetState(auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS ? AUTO_HIDE : VISIBLE); SetWindowOverlapsShelf(window_state == - WorkspaceManager::WINDOW_STATE_WINDOW_OVERLAPS_SHELF); + WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF); } } } |