diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 01:42:47 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 01:42:47 +0000 |
| commit | 80549c15ef5f28bd944dc3fbb1a4089f10146b6f (patch) | |
| tree | 147c0249fdb9e9d67ea154a02522f029af0c8b2d /ash/shell.cc | |
| parent | 8244643a07d2d7ffa082d02b22a80d09a621bf65 (diff) | |
| download | chromium_src-80549c15ef5f28bd944dc3fbb1a4089f10146b6f.zip chromium_src-80549c15ef5f28bd944dc3fbb1a4089f10146b6f.tar.gz chromium_src-80549c15ef5f28bd944dc3fbb1a4089f10146b6f.tar.bz2 | |
Cleanup: move AlwaysOnTopController to RootWindowController
remove if (shelf_) as it should always be there.
BUG=253991
Review URL: https://chromiumcodereview.appspot.com/18323011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 0ee5b6f..3f451df 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -39,7 +39,6 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/activation_controller.h" -#include "ash/wm/always_on_top_controller.h" #include "ash/wm/app_list_controller.h" #include "ash/wm/ash_activation_controller.h" #include "ash/wm/ash_focus_rules.h" @@ -938,16 +937,8 @@ void Shell::InitRootWindowController( controller->InitLayoutManagers(); controller->InitTouchHuds(); - // TODO(oshima): Move the instance to RootWindowController when - // the extended desktop is enabled by default. - internal::AlwaysOnTopController* always_on_top_controller = - new internal::AlwaysOnTopController; - always_on_top_controller->SetAlwaysOnTopContainer( - root_window->GetChildById(internal::kShellWindowId_AlwaysOnTopContainer)); - root_window->SetProperty(internal::kAlwaysOnTopControllerKey, - always_on_top_controller); if (GetPrimaryRootWindowController()->GetSystemModalLayoutManager(NULL)-> - has_modal_background()) { + has_modal_background()) { controller->GetSystemModalLayoutManager(NULL)->CreateModalBackground(); } |