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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no-find-copies Created 4 years, 5 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
« ash/shell.cc ('K') | « chrome/browser/extensions/global_shortcut_listener_chromeos.cc ('k') | chrome/browser/ui/ash/accelerator_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index f2d73c898e2459bd114533bba5bf4bdd93dfdc08..45228c41ecb419411709aa967c8755db392f44d2 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -192,6 +192,7 @@
#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/accelerators/accelerator_table.h"
#include "ash/common/accessibility_types.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
@@ -738,7 +739,7 @@ class PolicyTest : public InProcessBrowserTest {
->SetScreenshotDelegate(std::move(chrome_screenshot_grabber));
SetScreenshotPolicy(enabled);
- ash::Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled(
+ ash::WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
ash::TAKE_SCREENSHOT);
content::RunMessageLoop();
« ash/shell.cc ('K') | « chrome/browser/extensions/global_shortcut_listener_chromeos.cc ('k') | chrome/browser/ui/ash/accelerator_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698