Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Unified Diff: ash/wm/base_layout_manager.h

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/ash_native_cursor_manager_unittest.cc ('k') | ash/wm/base_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/base_layout_manager.h
diff --git a/ash/wm/base_layout_manager.h b/ash/wm/base_layout_manager.h
index 7a94bf389cbc5460df6120535ca05eb5fb4bb375..6f74e4c8f9404dd225713cfad35e37f5a6a1f586 100644
--- a/ash/wm/base_layout_manager.h
+++ b/ash/wm/base_layout_manager.h
@@ -19,7 +19,6 @@
#include "ui/events/event_handler.h"
namespace aura {
-class RootWindow;
class Window;
}
@@ -44,7 +43,7 @@ class ASH_EXPORT BaseLayoutManager
public:
typedef std::set<aura::Window*> WindowSet;
- explicit BaseLayoutManager(aura::RootWindow* root_window);
+ explicit BaseLayoutManager(aura::Window* root_window);
virtual ~BaseLayoutManager();
const WindowSet& windows() const { return windows_; }
@@ -109,7 +108,7 @@ class ASH_EXPORT BaseLayoutManager
wm::WindowState* window_state,
AdjustWindowReason reason);
- aura::RootWindow* root_window() { return root_window_; }
+ aura::Window* root_window() { return root_window_; }
private:
// Update window bounds based on a change in show state.
@@ -118,7 +117,7 @@ class ASH_EXPORT BaseLayoutManager
// Set of windows we're listening to.
WindowSet windows_;
- aura::RootWindow* root_window_;
+ aura::Window* root_window_;
DISALLOW_COPY_AND_ASSIGN(BaseLayoutManager);
};
« no previous file with comments | « ash/wm/ash_native_cursor_manager_unittest.cc ('k') | ash/wm/base_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698