Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1578)

Side by Side Diff: chrome/browser/ui/views/accelerator_utils_aura.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 #include "chrome/browser/ui/host_desktop.h"
7 #include "chrome/browser/ui/views/accelerator_table.h" 6 #include "chrome/browser/ui/views/accelerator_table.h"
8 #include "ui/base/accelerators/accelerator.h" 7 #include "ui/base/accelerators/accelerator.h"
8 #include "ui/gfx/host_desktop_type.h"
9 9
10 #if defined(USE_ASH) 10 #if defined(USE_ASH)
11 #include "ash/accelerators/accelerator_table.h" 11 #include "ash/accelerators/accelerator_table.h"
12 #endif // USE_ASH 12 #endif // USE_ASH
13 13
14 namespace chrome { 14 namespace chrome {
15 15
16 bool IsChromeAccelerator(const ui::Accelerator& accelerator, Profile* profile) { 16 bool IsChromeAccelerator(const ui::Accelerator& accelerator, Profile* profile) {
17 #if defined(USE_ASH) 17 #if defined(USE_ASH)
18 for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) { 18 for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 if (accelerators[i].command_id == command_id) { 54 if (accelerators[i].command_id == command_id) {
55 return ui::Accelerator(accelerators[i].keycode, 55 return ui::Accelerator(accelerators[i].keycode,
56 accelerators[i].modifiers); 56 accelerators[i].modifiers);
57 } 57 }
58 } 58 }
59 59
60 return ui::Accelerator(); 60 return ui::Accelerator();
61 } 61 }
62 62
63 } // namespace chrome 63 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.h ('k') | chrome/browser/ui/views/app_list/app_list_dialog_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698