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

Unified Diff: ash/touch/touch_observer_hud_unittest.cc

Issue 2911393002: Nix GetRootWindowController, use RootWindowController::ForWindow. (Closed)
Patch Set: Sync and rebase AGAIN Created 3 years, 7 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/touch/touch_observer_hud.cc ('k') | ash/wm/drag_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud_unittest.cc
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc
index 7e7402fde36bfe5b1ec0d3526f840c07bfd68738..6223bfe4f0b829fe08cdde0631275e27c04bcb21 100644
--- a/ash/touch/touch_observer_hud_unittest.cc
+++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -151,22 +151,22 @@ class TouchHudTestBase : public test::AshTestBase {
RootWindowController* GetInternalRootController() {
aura::Window* root = GetInternalRootWindow();
- return GetRootWindowController(root);
+ return RootWindowController::ForWindow(root);
}
RootWindowController* GetExternalRootController() {
aura::Window* root = GetExternalRootWindow();
- return GetRootWindowController(root);
+ return RootWindowController::ForWindow(root);
}
RootWindowController* GetPrimaryRootController() {
aura::Window* root = GetPrimaryRootWindow();
- return GetRootWindowController(root);
+ return RootWindowController::ForWindow(root);
}
RootWindowController* GetSecondaryRootController() {
aura::Window* root = GetSecondaryRootWindow();
- return GetRootWindowController(root);
+ return RootWindowController::ForWindow(root);
}
display::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
« no previous file with comments | « ash/touch/touch_observer_hud.cc ('k') | ash/wm/drag_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698