chrome/browser/ui/ash/ash_util.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

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

« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/ash/chrome_new_window_client_browsertest.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/common/accelerators/accelerator_controller.h"	7 #include "ash/accelerators/accelerator_controller.h"

8 #include "ash/common/mojo_interface_factory.h"	8 #include "ash/mojo_interface_factory.h"

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

10 #include "base/macros.h"	10 #include "base/macros.h"

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

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

13 #include "content/public/common/service_names.mojom.h"	13 #include "content/public/common/service_names.mojom.h"

14 #include "services/service_manager/public/cpp/interface_registry.h"	14 #include "services/service_manager/public/cpp/interface_registry.h"

15 #include "services/service_manager/public/cpp/service.h"	15 #include "services/service_manager/public/cpp/service.h"

16 #include "services/service_manager/public/interfaces/interface_provider_spec.moj om.h"	16 #include "services/service_manager/public/interfaces/interface_provider_spec.moj om.h"

17 #include "services/service_manager/runner/common/client_util.h"	17 #include "services/service_manager/runner/common/client_util.h"

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

19	19

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {	65 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {

66 // When running in mash the browser doesn't handle ash accelerators.	66 // When running in mash the browser doesn't handle ash accelerators.

67 if (IsRunningInMash())	67 if (IsRunningInMash())

68 return false;	68 return false;

69	69

70 return ash::WmShell::Get()->accelerator_controller()->IsDeprecated(	70 return ash::WmShell::Get()->accelerator_controller()->IsDeprecated(

71 accelerator);	71 accelerator);

72 }	72 }

73	73

74 } // namespace ash_util	74 } // namespace ash_util

OLD	NEW