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

Side by Side Diff: ui/base/accelerators/accelerator.cc

Issue 16402012: Use a direct include of strings headers in ui/, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/accelerators/accelerator.h ('k') | ui/base/accessibility/accessible_text_utils.h » ('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 "ui/base/accelerators/accelerator.h" 5 #include "ui/base/accelerators/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_GTK) 9 #elif defined(TOOLKIT_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/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "grit/ui_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 #if !defined(OS_WIN) && (defined(USE_AURA) || defined(OS_MACOSX)) 20 #if !defined(OS_WIN) && (defined(USE_AURA) || defined(OS_MACOSX))
21 #include "ui/base/keycodes/keyboard_code_conversion.h" 21 #include "ui/base/keycodes/keyboard_code_conversion.h"
22 #endif 22 #endif
23 23
24 namespace ui { 24 namespace ui {
25 25
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 // Subtracting the size of the shortcut key and 1 for the '+' sign. 253 // Subtracting the size of the shortcut key and 1 for the '+' sign.
254 shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1); 254 shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
255 shortcut.swap(shortcut_rtl); 255 shortcut.swap(shortcut_rtl);
256 } 256 }
257 257
258 return shortcut; 258 return shortcut;
259 } 259 }
260 260
261 } // namespace ui 261 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/accelerators/accelerator.h ('k') | ui/base/accessibility/accessible_text_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698