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

Unified Diff: ui/aura/root_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/root_window.h ('k') | ui/aura/window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.cc
===================================================================
--- ui/aura/root_window.cc (revision 119894)
+++ ui/aura/root_window.cc (working copy)
@@ -407,6 +407,16 @@
gesture_recognizer_.reset(gr);
}
+#if !defined(NDEBUG)
+void RootWindow::ToggleFullScreen() {
+ host_->ToggleFullScreen();
+}
+#endif
+
+RootWindow* RootWindow::GetRootWindow() {
+ return this;
+}
+
void RootWindow::SetTransform(const ui::Transform& transform) {
Window::SetTransform(transform);
@@ -416,12 +426,6 @@
OnHostResized(host_->GetSize());
}
-#if !defined(NDEBUG)
-void RootWindow::ToggleFullScreen() {
- host_->ToggleFullScreen();
-}
-#endif
-
////////////////////////////////////////////////////////////////////////////////
// RootWindow, private:
@@ -627,10 +631,6 @@
return this;
}
-RootWindow* RootWindow::GetRootWindow() {
- return this;
-}
-
void RootWindow::OnWindowDetachingFromRootWindow(Window* detached) {
DCHECK(capture_window_ != this);
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698