chrome/browser/ui/ash/ash_util.cc - Issue 2166793005: Moves accelerator code using common types to ash/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/ash_util.cc

Issue 2166793005: Moves accelerator code using common types to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@debug_commands

Patch Set: not relative 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 unified diff | Download patch

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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/ash/ash_util.h"	5 #include "chrome/browser/ui/ash/ash_util.h"

6	6

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

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "build/build_config.h"	9 #include "build/build_config.h"

10 #include "chrome/browser/ui/ash/ash_init.h"	10 #include "chrome/browser/ui/ash/ash_init.h"

11 #include "ui/aura/window_event_dispatcher.h"	11 #include "ui/aura/window_event_dispatcher.h"

12	12

13 #if defined(MOJO_SHELL_CLIENT)	13 #if defined(MOJO_SHELL_CLIENT)

14 #include "services/shell/runner/common/client_util.h"	14 #include "services/shell/runner/common/client_util.h"

15 #endif	15 #endif

16	16

17 namespace chrome {	17 namespace chrome {

(...skipping 14 matching lines...) Expand all Loading...
32 // When running in mash the browser doesn't handle ash accelerators.	32 // When running in mash the browser doesn't handle ash accelerators.

33 if (chrome::IsRunningInMash())	33 if (chrome::IsRunningInMash())

34 return false;	34 return false;

35	35

36 ash::AcceleratorController* controller =	36 ash::AcceleratorController* controller =

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

38 return controller->IsDeprecated(accelerator);	38 return controller->IsDeprecated(accelerator);

39 }	39 }

40	40

41 } // namespace chrome	41 } // namespace chrome

OLD	NEW