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

Side by Side Diff: ash/accelerators/accelerator_table.cc

Issue 2163253003: Moves ash/strings to ash/common/strings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: extraneous 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 | « ash/BUILD.gn ('k') | ash/ash_strings.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ash/accelerators/accelerator_table.h" 5 #include "ash/accelerators/accelerator_table.h"
6 6
7 #include "ash/strings/grit/ash_strings.h" 7 #include "ash/common/strings/grit/ash_strings.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace ash { 10 namespace ash {
11 11
12 const int kDebugModifier = 12 const int kDebugModifier =
13 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN; 13 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN;
14 14
15 const AcceleratorData kAcceleratorData[] = { 15 const AcceleratorData kAcceleratorData[] = {
16 {true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME}, 16 {true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME},
17 {false, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME}, 17 {false, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME},
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 TOGGLE_WIFI, 520 TOGGLE_WIFI,
521 VOLUME_DOWN, 521 VOLUME_DOWN,
522 VOLUME_MUTE, 522 VOLUME_MUTE,
523 VOLUME_UP, 523 VOLUME_UP,
524 #endif // defined(OS_CHROMEOS) 524 #endif // defined(OS_CHROMEOS)
525 }; 525 };
526 526
527 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 527 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
528 528
529 } // namespace ash 529 } // namespace ash
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/ash_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698