diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 15:26:03 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 15:26:03 +0000 |
| commit | 24eea16cb849a85b22ff6460358ecfcfe4f81279 (patch) | |
| tree | b1b3a757edf28fb07ad78374c6926d94dc9f99d6 /ash/shell.cc | |
| parent | 6a24fccd5c2e34a7522438a92cef6e7de41c2ec8 (diff) | |
| download | chromium_src-24eea16cb849a85b22ff6460358ecfcfe4f81279.zip chromium_src-24eea16cb849a85b22ff6460358ecfcfe4f81279.tar.gz chromium_src-24eea16cb849a85b22ff6460358ecfcfe4f81279.tar.bz2 | |
Adds the ability for windows to persist across all workspaces. Chrome
makes the default that all windows persist across all workspaces and
explicitly disables this for browsers. As part of this I promoted
duplicated code from WorkspaceLayoutManager and
AlwaysOnTopLayoutManager to BaseLayoutManager.
BUG=122301,122390,121280,121784
TEST=see bugs, covered by unit tests too.
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10020061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 0d30ef1..8fc842c 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -65,7 +65,6 @@ #include "ash/wm/window_cycle_controller.h" #include "ash/wm/window_modality_controller.h" #include "ash/wm/window_util.h" -#include "ash/wm/workspace/always_on_top_layout_manager.h" #include "ash/wm/workspace/workspace_event_filter.h" #include "ash/wm/workspace/workspace_layout_manager.h" #include "ash/wm/workspace/workspace_manager.h" @@ -925,7 +924,7 @@ void Shell::InitLayoutManagers() { aura::Window* always_on_top_container = GetContainer(internal::kShellWindowId_AlwaysOnTopContainer); always_on_top_container->SetLayoutManager( - new internal::AlwaysOnTopLayoutManager( + new internal::BaseLayoutManager( always_on_top_container->GetRootWindow())); // Create desktop background widget. |