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

Side by Side Diff: chrome/browser/ui/views/accelerator_utils_aura.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
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 <stddef.h>
6
5 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
6 #include "chrome/browser/ui/host_desktop.h" 8 #include "chrome/browser/ui/host_desktop.h"
7 #include "chrome/browser/ui/views/accelerator_table.h" 9 #include "chrome/browser/ui/views/accelerator_table.h"
8 #include "ui/base/accelerators/accelerator.h" 10 #include "ui/base/accelerators/accelerator.h"
9 11
10 #if defined(USE_ASH) 12 #if defined(USE_ASH)
11 #include "ash/accelerators/accelerator_table.h" 13 #include "ash/accelerators/accelerator_table.h"
12 #endif // USE_ASH 14 #endif // USE_ASH
13 15
14 namespace chrome { 16 namespace chrome {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 if (accelerators[i].command_id == command_id) { 56 if (accelerators[i].command_id == command_id) {
55 return ui::Accelerator(accelerators[i].keycode, 57 return ui::Accelerator(accelerators[i].keycode,
56 accelerators[i].modifiers); 58 accelerators[i].modifiers);
57 } 59 }
58 } 60 }
59 61
60 return ui::Accelerator(); 62 return ui::Accelerator();
61 } 63 }
62 64
63 } // namespace chrome 65 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table_unittest.cc ('k') | chrome/browser/ui/views/accessibility/invert_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698