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

Unified Diff: ash/magnifier/magnification_controller_unittest.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 | « ash/magnifier/magnification_controller.cc ('k') | ash/magnifier/partial_magnification_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/magnification_controller_unittest.cc
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc
index 63608fc74ddb94c4181eaf26bf3b91d8e15e5edc..2f87ee112d5ec6760495df798a65a97b2f2e8641 100644
--- a/ash/magnifier/magnification_controller_unittest.cc
+++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -32,7 +32,7 @@ class MagnificationControllerTest: public test::AshTestBase {
AshTestBase::SetUp();
UpdateDisplay(base::StringPrintf("%dx%d", kRootWidth, kRootHeight));
- aura::RootWindow* root = GetRootWindow();
+ aura::Window* root = GetRootWindow();
gfx::Rect root_bounds(root->bounds());
#if defined(OS_WIN)
@@ -48,13 +48,13 @@ class MagnificationControllerTest: public test::AshTestBase {
}
protected:
- aura::RootWindow* GetRootWindow() const {
+ aura::Window* GetRootWindow() const {
return Shell::GetPrimaryRootWindow();
}
std::string GetHostMouseLocation() {
gfx::Point point;
- GetRootWindow()->QueryMouseLocationForTest(&point);
+ GetRootWindow()->GetDispatcher()->QueryMouseLocationForTest(&point);
return point.ToString();
}
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/magnifier/partial_magnification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698