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

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

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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 | « ui/base/models/accelerator.h ('k') | ui/ui.gyp » ('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 "views/accelerator.h" 5 #include "ui/base/models/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/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 namespace views { 20 namespace ui {
21 21
22 string16 Accelerator::GetShortcutText() const { 22 string16 Accelerator::GetShortcutText() const {
23 int string_id = 0; 23 int string_id = 0;
24 switch(key_code_) { 24 switch(key_code_) {
25 case ui::VKEY_TAB: 25 case ui::VKEY_TAB:
26 string_id = IDS_APP_TAB_KEY; 26 string_id = IDS_APP_TAB_KEY;
27 break; 27 break;
28 case ui::VKEY_RETURN: 28 case ui::VKEY_RETURN:
29 string_id = IDS_APP_ENTER_KEY; 29 string_id = IDS_APP_ENTER_KEY;
30 break; 30 break;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 shortcut_rtl.append(ASCIIToUTF16("+")); 153 shortcut_rtl.append(ASCIIToUTF16("+"));
154 154
155 // Subtracting the size of the shortcut key and 1 for the '+' sign. 155 // Subtracting the size of the shortcut key and 1 for the '+' sign.
156 shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1); 156 shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
157 shortcut.swap(shortcut_rtl); 157 shortcut.swap(shortcut_rtl);
158 } 158 }
159 159
160 return shortcut; 160 return shortcut;
161 } 161 }
162 162
163 } // namespace views 163 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/models/accelerator.h ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698