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/root_window_controller.h | |
| 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/root_window_controller.h')
| -rw-r--r-- | ash/root_window_controller.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 4fe4578..a6b81c1 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -45,6 +45,7 @@ class ToplevelWindowEventHandler; namespace internal { +class AlwaysOnTopController; class BootSplashScreen; class DockedWindowLayoutManager; class PanelLayoutManager; @@ -88,6 +89,10 @@ class ASH_EXPORT RootWindowController { return workspace_controller_.get(); } + AlwaysOnTopController* always_on_top_controller() { + return always_on_top_controller_.get(); + } + ScreenDimmer* screen_dimmer() { return screen_dimmer_.get(); } // Access the shelf associated with this root window controller, @@ -230,6 +235,7 @@ class ASH_EXPORT RootWindowController { scoped_ptr<ScreenDimmer> screen_dimmer_; scoped_ptr<WorkspaceController> workspace_controller_; + scoped_ptr<AlwaysOnTopController> always_on_top_controller_; // Heads-up displays for touch events. These HUDs are not owned by the root // window controller and manage their own lifetimes. |