From 80549c15ef5f28bd944dc3fbb1a4089f10146b6f Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Tue, 2 Jul 2013 01:42:47 +0000 Subject: 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 --- ash/root_window_controller.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ash/root_window_controller.h') 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 screen_dimmer_; scoped_ptr workspace_controller_; + scoped_ptr 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. -- cgit v1.1