diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 16:04:04 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 16:04:04 +0000 |
| commit | c96b981c0c43e0cf6e0ef0035706fbea869dd939 (patch) | |
| tree | 940fd3b0f2fbf08c64ddf3f6e573c2043ac5925a /ash/shell | |
| parent | 3a6ec768208d2d056aa971e7e4bdc5305343db7b (diff) | |
| download | chromium_src-c96b981c0c43e0cf6e0ef0035706fbea869dd939.zip chromium_src-c96b981c0c43e0cf6e0ef0035706fbea869dd939.tar.gz chromium_src-c96b981c0c43e0cf6e0ef0035706fbea869dd939.tar.bz2 | |
Removes worskpace 1 code. Will rename next.
BUG=none
TEST=none
R=ben@chromium.org,nkostylev@chromium.org
TBR=nkostylev@chromium.org
Review URL: https://codereview.chromium.org/11201002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/window_watcher.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index d37e8c8..a85d8f6 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -8,7 +8,6 @@ #include "ash/launcher/launcher_model.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/wm/workspace_controller.h" #include "ui/aura/window.h" namespace ash { @@ -48,16 +47,11 @@ WindowWatcher::WindowWatcher() panel_container_(ash::Shell::GetContainer( Shell::GetPrimaryRootWindow(), internal::kShellWindowId_PanelContainer)) { - if (internal::WorkspaceController::IsWorkspace2Enabled()) - workspace_window_watcher_.reset(new WorkspaceWindowWatcher(this)); - else - window_->AddObserver(this); + workspace_window_watcher_.reset(new WorkspaceWindowWatcher(this)); panel_container_->AddObserver(this); } WindowWatcher::~WindowWatcher() { - if (!internal::WorkspaceController::IsWorkspace2Enabled()) - window_->RemoveObserver(this); panel_container_->RemoveObserver(this); } |