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

Unified Diff: trunk/src/ash/magnifier/partial_magnification_controller.h

Issue 59153004: Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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
Index: trunk/src/ash/magnifier/partial_magnification_controller.h
===================================================================
--- trunk/src/ash/magnifier/partial_magnification_controller.h (revision 233812)
+++ trunk/src/ash/magnifier/partial_magnification_controller.h (working copy)
@@ -10,6 +10,10 @@
#include "ui/gfx/point.h"
#include "ui/views/widget/widget_observer.h"
+namespace aura {
+class RootWindow;
+}
+
namespace ash {
const float kDefaultPartialMagnifiedScale = 1.5f;
@@ -48,7 +52,7 @@
void SwitchTargetRootWindow(aura::Window* new_root_window);
// Returns the root window that contains the mouse cursor.
- aura::Window* GetCurrentRootWindow();
+ aura::RootWindow* GetCurrentRootWindow();
// Return true if the magnification scale > kMinPartialMagnifiedScaleThreshold
bool IsPartialMagnified() const;
« no previous file with comments | « trunk/src/ash/high_contrast/high_contrast_controller.cc ('k') | trunk/src/ash/magnifier/partial_magnification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698