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

Side by Side Diff: chrome/browser/ui/views/accelerator_table.cc

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « no previous file | chrome/browser/ui/views/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 "chrome/browser/ui/views/accelerator_table.h" 5 #include "chrome/browser/ui/views/accelerator_table.h"
6 6
7 #include "base/basictypes.h" 7 #include <stddef.h>
8
9 #include "base/macros.h"
10 #include "build/build_config.h"
8 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
9 #include "ui/base/accelerators/accelerator.h" 12 #include "ui/base/accelerators/accelerator.h"
10 #include "ui/events/event_constants.h" 13 #include "ui/events/event_constants.h"
11 14
12 #if defined(USE_ASH) 15 #if defined(USE_ASH)
13 #include "ash/accelerators/accelerator_table.h" 16 #include "ash/accelerators/accelerator_table.h"
14 #endif 17 #endif
15 18
16 namespace chrome { 19 namespace chrome {
17 namespace { 20 namespace {
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); 265 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN);
263 return true; 266 return true;
264 case IDC_PASTE: 267 case IDC_PASTE:
265 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); 268 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
266 return true; 269 return true;
267 } 270 }
268 return false; 271 return false;
269 } 272 }
270 273
271 } // namespace chrome 274 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/accelerator_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698