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

Side by Side Diff: ui/views/events/accelerator.cc

Issue 7210060: Rename app_strings to ui_strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « ui/base/text/bytes_formatting.cc ('k') | views/DEPS » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/views/events/accelerator.h" 5 #include "ui/views/events/accelerator.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #elif defined(TOOLKIT_USES_GTK) 9 #elif defined(TOOLKIT_USES_GTK)
10 #include <gdk/gdk.h> 10 #include <gdk/gdk.h>
11 #endif 11 #endif
12 12
13 #include "base/i18n/rtl.h" 13 #include "base/i18n/rtl.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "grit/app_strings.h" 17 #include "grit/ui_strings.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 19
20 namespace ui { 20 namespace ui {
21 21
22 namespace { 22 namespace {
23 23
24 bool IsShiftDown(const Accelerator& accelerator) { 24 bool IsShiftDown(const Accelerator& accelerator) {
25 return (accelerator.key_code() & VKEY_SHIFT) == VKEY_SHIFT; 25 return (accelerator.key_code() & VKEY_SHIFT) == VKEY_SHIFT;
26 } 26 }
27 27
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 170
171 // Subtracting the size of the shortcut key and 1 for the '+' sign. 171 // Subtracting the size of the shortcut key and 1 for the '+' sign.
172 shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1); 172 shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
173 shortcut.swap(shortcut_rtl); 173 shortcut.swap(shortcut_rtl);
174 } 174 }
175 175
176 return shortcut; 176 return shortcut;
177 } 177 }
178 178
179 } // namespace ui 179 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/text/bytes_formatting.cc ('k') | views/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698