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

Unified Diff: ui/aura/window.cc

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/window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.cc
===================================================================
--- ui/aura/window.cc (revision 119894)
+++ ui/aura/window.cc (working copy)
@@ -144,6 +144,15 @@
return layer_owner_.release();
}
+RootWindow* Window::GetRootWindow() {
+ return const_cast<RootWindow*>(
+ static_cast<const Window*>(this)->GetRootWindow());
+}
+
+const RootWindow* Window::GetRootWindow() const {
+ return parent_ ? parent_->GetRootWindow() : NULL;
+}
+
void Window::Show() {
SetVisible(true);
}
@@ -510,10 +519,6 @@
return it != children_.end();
}
-RootWindow* Window::GetRootWindow() {
- return parent_ ? parent_->GetRootWindow() : NULL;
-}
-
void Window::OnWindowDetachingFromRootWindow(aura::Window* window) {
}
« no previous file with comments | « ui/aura/window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698