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

Unified Diff: ash/dip_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/desktop_background/desktop_background_controller_unittest.cc ('k') | ash/display/display_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/dip_unittest.cc
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index 59020e8c349592de285cf5f0a0fdadd796f73619..a501ad251389297877353db81c585cf5e2c6aa03 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -35,7 +35,7 @@ typedef ash::test::AshTestBase DIPTest;
TEST_F(DIPTest, WorkArea) {
UpdateDisplay("1000x900*1.0f");
- aura::RootWindow* root = Shell::GetPrimaryRootWindow();
+ aura::Window* root = Shell::GetPrimaryRootWindow();
const gfx::Display display =
Shell::GetScreen()->GetDisplayNearestWindow(root);
@@ -74,7 +74,7 @@ TEST_F(DIPTest, WorkAreaForLegacyShelfLayout) {
ash::switches::kAshDisableAlternateShelfLayout);
UpdateDisplay("1000x900*1.0f");
- aura::RootWindow* root = Shell::GetPrimaryRootWindow();
+ aura::Window* root = Shell::GetPrimaryRootWindow();
const gfx::Display display =
Shell::GetScreen()->GetDisplayNearestWindow(root);
« no previous file with comments | « ash/desktop_background/desktop_background_controller_unittest.cc ('k') | ash/display/display_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698