Remove some uses of RootWindow in Ash.
Adds a window() accessor to RootWindow. This is redundant now but necessary for when RootWindow is no longer a RootWindow. A subsequent CL will sever that relationship.
[email protected]
http://crbug.com/308843
Review URL: https://codereview.chromium.org/67083004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234082 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index fa8172f9..980bf1e 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -13,13 +13,13 @@
#include "ash/system/user/login_status.h"
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
+#include "ui/aura/root_window.h"
#include "ui/base/ui_base_types.h"
class SkBitmap;
namespace aura {
class EventFilter;
-class RootWindow;
class Window;
}
@@ -102,7 +102,8 @@
virtual ~RootWindowController();
- aura::RootWindow* root_window() { return root_window_.get(); }
+ aura::Window* root_window() { return dispatcher()->window(); }
+ aura::WindowEventDispatcher* dispatcher() { return root_window_.get(); }
RootWindowLayoutManager* root_window_layout() { return root_window_layout_; }
@@ -245,7 +246,7 @@
// Creates each of the special window containers that holds windows of various
// types in the shell UI.
- void CreateContainersInRootWindow(aura::RootWindow* root_window);
+ void CreateContainersInRootWindow(aura::Window* root_window);
// Enables projection touch HUD.
void EnableTouchHudProjection();
