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

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

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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/accelerators/accelerator_table.h ('k') | ash/accelerators/accelerator_table_unittest.cc » ('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/strings/grit/ash_strings.h"
8 #include "base/basictypes.h" 8 #include "base/macros.h"
9 9
10 namespace ash { 10 namespace ash {
11 11
12 const AcceleratorData kAcceleratorData[] = { 12 const AcceleratorData kAcceleratorData[] = {
13 { true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME }, 13 { true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME },
14 { false, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME }, 14 { false, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME },
15 // Shortcuts for Japanese IME. 15 // Shortcuts for Japanese IME.
16 { true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME }, 16 { true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME },
17 { true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME }, 17 { true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME },
18 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME }, 18 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME },
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 TOGGLE_WIFI, 544 TOGGLE_WIFI,
545 VOLUME_DOWN, 545 VOLUME_DOWN,
546 VOLUME_MUTE, 546 VOLUME_MUTE,
547 VOLUME_UP, 547 VOLUME_UP,
548 #endif // defined(OS_CHROMEOS) 548 #endif // defined(OS_CHROMEOS)
549 }; 549 };
550 550
551 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 551 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
552 552
553 } // namespace ash 553 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/accelerator_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698