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

Unified Diff: ash/mus/accelerators/accelerator_controller_registrar.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/magnifier/magnification_controller.cc ('k') | ash/mus/top_level_window_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/accelerators/accelerator_controller_registrar.cc
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc
index ef1f124aec88abf0fabd81eba67210f22dcf598c..acc97cb99b4f8aa5b0f733ddb318348d5efabdfc 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.cc
+++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -11,6 +11,7 @@
#include "ash/common/wm_shell.h"
#include "ash/mus/accelerators/accelerator_ids.h"
#include "ash/mus/window_manager.h"
+#include "ash/shell.h"
#include "base/logging.h"
#include "services/ui/common/accelerator_util.h"
#include "ui/base/accelerators/accelerator_history.h"
@@ -83,7 +84,7 @@ ui::mojom::EventResult AcceleratorControllerRegistrar::OnAccelerator(
accelerator);
WmWindow* target_window = WmShell::Get()->GetFocusedWindow();
if (!target_window)
- target_window = WmShell::Get()->GetRootWindowForNewWindows();
+ target_window = Shell::GetWmRootWindowForNewWindows();
DCHECK(target_window);
return router_->ProcessAccelerator(target_window, *(event.AsKeyEvent()),
accelerator)
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/mus/top_level_window_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698