chrome/browser/ui/ash/accelerator_controller_browsertest.cc - Issue 2170753005: Moves AcceleratorController from Shell to WmShell

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/accelerator_controller_browsertest.cc

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: include 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:

Index: chrome/browser/ui/ash/accelerator_controller_browsertest.cc

diff --git a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc

index a89cbca16b5b7e6741a7bee5a34ce12f9cc6f137..f381e1bcdc8260f6f951f88b66de9d4083d71d36 100644

--- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc

+++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc

@@ -5,6 +5,7 @@

#include "ash/common/accelerators/accelerator_controller.h"

#include "ash/common/wm/window_state.h"

+#include "ash/common/wm_shell.h"

#include "ash/shell.h"

#include "ash/wm/window_state_aura.h"

#include "build/build_config.h"

@@ -34,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(AcceleratorControllerBrowserTest,

ui::Accelerator accelerator(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);

ash::AcceleratorController* accelerator_controller =

- ash::Shell::GetInstance()->accelerator_controller();

+ ash::WmShell::Get()->accelerator_controller();

ASSERT_TRUE(accelerator_controller->IsRegistered(accelerator));

ash::wm::WindowState* window_state = ash::wm::GetActiveWindowState();

« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »