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

Unified Diff: ash/test/ui_controls_factory_ash.cc

Issue 2739553005: Moves maintaining root_window_for_new_windows_ to Shell (Closed)
Patch Set: remove ash:: Created 3 years, 9 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/test/ash_test_helper.cc ('k') | ash/wm/ash_focus_rules.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ui_controls_factory_ash.cc
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc
index d06063577285403aaf7bf174e14854fb6420e30f..883ccdd3e655a387e6cae2f55ad775c9b1420c1e 100644
--- a/ash/test/ui_controls_factory_ash.cc
+++ b/ash/test/ui_controls_factory_ash.cc
@@ -73,8 +73,8 @@ class UIControlsAsh : public UIControlsAura {
bool alt,
bool command,
const base::Closure& closure) override {
- aura::Window* root =
- window ? window->GetRootWindow() : ash::Shell::GetTargetRootWindow();
+ aura::Window* root = window ? window->GetRootWindow()
+ : ash::Shell::GetRootWindowForNewWindows();
UIControlsAura* ui_controls = GetUIControlsForRootWindow(root);
return ui_controls &&
ui_controls->SendKeyPressNotifyWhenDone(window, key, control, shift,
@@ -120,7 +120,7 @@ class UIControlsAsh : public UIControlsAura {
void RunClosureAfterAllPendingUIEvents(
const base::Closure& closure) override {
UIControlsAura* ui_controls =
- GetUIControlsForRootWindow(ash::Shell::GetTargetRootWindow());
+ GetUIControlsForRootWindow(ash::Shell::GetRootWindowForNewWindows());
if (ui_controls)
ui_controls->RunClosureAfterAllPendingUIEvents(closure);
}
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | ash/wm/ash_focus_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698