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

Side by Side Diff: views/accelerator.cc

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed review issue Created 9 years, 3 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 | « build/common.gypi ('k') | views/controls/link.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) 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 "views/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(OS_LINUX) 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
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // layouts have characters other than digits assigned in 76 // layouts have characters other than digits assigned in
77 // an unshifted mode (e.g. French AZERY layout has 'a with grave 77 // an unshifted mode (e.g. French AZERY layout has 'a with grave
78 // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the 78 // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
79 // default zoom level), we leave VK_[0-9] alone without translation. 79 // default zoom level), we leave VK_[0-9] alone without translation.
80 wchar_t key; 80 wchar_t key;
81 if (key_code_ >= '0' && key_code_ <= '9') 81 if (key_code_ >= '0' && key_code_ <= '9')
82 key = key_code_; 82 key = key_code_;
83 else 83 else
84 key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR)); 84 key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
85 shortcut += key; 85 shortcut += key;
86 #elif defined(OS_LINUX) 86 #elif defined(TOOLKIT_USES_GTK)
87 const gchar* name = NULL; 87 const gchar* name = NULL;
88 switch (key_code_) { 88 switch (key_code_) {
89 case ui::VKEY_OEM_2: 89 case ui::VKEY_OEM_2:
90 name = static_cast<const gchar*>("/"); 90 name = static_cast<const gchar*>("/");
91 break; 91 break;
92 default: 92 default:
93 name = gdk_keyval_name(gdk_keyval_to_lower(key_code_)); 93 name = gdk_keyval_name(gdk_keyval_to_lower(key_code_));
94 break; 94 break;
95 } 95 }
96 if (name) { 96 if (name) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 views
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | views/controls/link.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698