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

Unified Diff: ui/aura/window.h

Issue 9318002: Makes GetRootWindow() public on Window so we can begin to convert uses of RootWindow::GetInstance(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 | « ui/aura/root_window.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.h
===================================================================
--- ui/aura/window.h (revision 119894)
+++ ui/aura/window.h (working copy)
@@ -105,6 +105,11 @@
Window* parent() { return parent_; }
const Window* parent() const { return parent_; }
+ // Returns the RootWindow that contains this Window or NULL if the Window is
+ // not contained by a RootWindow.
+ virtual RootWindow* GetRootWindow();
+ virtual const RootWindow* GetRootWindow() const;
+
// The Window does not own this object.
void set_user_data(void* user_data) { user_data_ = user_data; }
void* user_data() const { return user_data_; }
@@ -289,10 +294,6 @@
bool StopsEventPropagation() const;
protected:
- // Returns the root window or NULL if we aren't yet attached to the root
- // window.
- virtual RootWindow* GetRootWindow();
-
// Called when the |window| is being detached from the root window
// by being removed from its parent. It is called before |parent_| is
// set to NULL.
« no previous file with comments | « ui/aura/root_window.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698