chrome/browser/ui/ash/ash_util.cc - Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h

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 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type

Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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/apps/chrome_app_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_views.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/accelerators/accelerator_controller.h"

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

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

10 #include "chrome/browser/ui/host_desktop.h"

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

	11 #include "ui/gfx/host_desktop_type.h"

12	12

13 #if !defined(OS_CHROMEOS)	13 #if !defined(OS_CHROMEOS)

14 #include "base/command_line.h"	14 #include "base/command_line.h"

15 #include "chrome/common/chrome_switches.h"	15 #include "chrome/common/chrome_switches.h"

16 #endif	16 #endif

17	17

18 namespace chrome {	18 namespace chrome {

19	19

20 bool ShouldOpenAshOnStartup() {	20 bool ShouldOpenAshOnStartup() {

21 #if defined(OS_CHROMEOS)	21 #if defined(OS_CHROMEOS)

(...skipping 29 matching lines...) Expand all Loading...
51 return IsNativeViewInAsh(native_window);	51 return IsNativeViewInAsh(native_window);

52 }	52 }

53	53

54 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {	54 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {

55 ash::AcceleratorController* controller =	55 ash::AcceleratorController* controller =

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

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

58 }	58 }

59	59

60 } // namespace chrome	60 } // namespace chrome

OLD	NEW