chrome/browser/ui/views/accelerator_utils_aura.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

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/views/accelerator_utils_aura.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl

Patch Set: Fix build on Mac and CrOS 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/accelerator_table.cc ('k') | chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/accelerator_utils_aura.cc

diff --git a/chrome/browser/ui/views/accelerator_utils_aura.cc b/chrome/browser/ui/views/accelerator_utils_aura.cc

index 42f45929b60645c68ec7e48c23130d798f77804a..bc729aea7145bba25f90fdde63eca1abc338c8d0 100644

--- a/chrome/browser/ui/views/accelerator_utils_aura.cc

+++ b/chrome/browser/ui/views/accelerator_utils_aura.cc

@@ -38,12 +38,12 @@ bool IsChromeAccelerator(const ui::Accelerator& accelerator, Profile* profile) {

ui::Accelerator GetPrimaryChromeAcceleratorForCommandId(int command_id) {

ui::Accelerator accelerator;

- // GetAshAcceleratorForCommandId with HOST_DESKTOP_TYPE_ASH is used so we can

+ // GetAshAcceleratorForCommandId with ui::HOST_DESKTOP_TYPE_ASH is used so we

+ // can

// find Ash accelerators if Ash is supported on this platform, even if it's

// not currently in use.

if (GetStandardAcceleratorForCommandId(command_id, &accelerator) ||

- GetAshAcceleratorForCommandId(command_id,

- HOST_DESKTOP_TYPE_ASH,

+ GetAshAcceleratorForCommandId(command_id, ui::HOST_DESKTOP_TYPE_ASH,

&accelerator)) {

return accelerator;

}