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

Unified Diff: ui/aura/root_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 | « no previous file | ui/aura/root_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.h
===================================================================
--- ui/aura/root_window.h (revision 119894)
+++ ui/aura/root_window.h (working copy)
@@ -180,14 +180,15 @@
// Provided only for testing:
void SetGestureRecognizerForTesting(GestureRecognizer* gr);
- // Overridden from Window:
- virtual void SetTransform(const ui::Transform& transform) OVERRIDE;
-
#if !defined(NDEBUG)
// Toggles the host's full screen state.
void ToggleFullScreen();
#endif
+ // Overridden from Window:
+ virtual RootWindow* GetRootWindow() OVERRIDE;
+ virtual void SetTransform(const ui::Transform& transform) OVERRIDE;
+
// Overridden from ui::CompositorDelegate:
virtual void ScheduleDraw() OVERRIDE;
@@ -215,7 +216,6 @@
virtual bool CanFocus() const OVERRIDE;
virtual bool CanReceiveEvents() const OVERRIDE;
virtual internal::FocusManager* GetFocusManager() OVERRIDE;
- virtual RootWindow* GetRootWindow() OVERRIDE;
// Overridden from ui::LayerAnimationObserver:
virtual void OnLayerAnimationEnded(
« no previous file with comments | « no previous file | ui/aura/root_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698