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

Side by Side Diff: chrome/browser/chromeos/status/language_menu_button.cc

Issue 2879002: Reapply r50859 with chromeos fixes. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: add explicit menus:: to chromeos Created 10 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/browser/chromeos/status/language_menu_button.h" 5 #include "chrome/browser/chromeos/status/language_menu_button.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 bool LanguageMenuButton::HasIcons() const { 233 bool LanguageMenuButton::HasIcons() const {
234 // We don't support icons on Chrome OS. 234 // We don't support icons on Chrome OS.
235 return false; 235 return false;
236 } 236 }
237 237
238 bool LanguageMenuButton::GetIconAt(int index, SkBitmap* icon) const { 238 bool LanguageMenuButton::GetIconAt(int index, SkBitmap* icon) const {
239 return false; 239 return false;
240 } 240 }
241 241
242 menus::ButtonMenuItemModel* LanguageMenuButton::GetButtonMenuItemAt(
243 int index) const {
244 return NULL;
245 }
246
242 bool LanguageMenuButton::IsEnabledAt(int index) const { 247 bool LanguageMenuButton::IsEnabledAt(int index) const {
243 // Just return true so all input method names and input method propertie names 248 // Just return true so all input method names and input method propertie names
244 // could be clicked. 249 // could be clicked.
245 return true; 250 return true;
246 } 251 }
247 252
248 menus::MenuModel* LanguageMenuButton::GetSubmenuModelAt(int index) const { 253 menus::MenuModel* LanguageMenuButton::GetSubmenuModelAt(int index) const {
249 // We don't use nested menus. 254 // We don't use nested menus.
250 return NULL; 255 return NULL;
251 } 256 }
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 if (add_method_name) { 608 if (add_method_name) {
604 text += L" - "; 609 text += L" - ";
605 text += input_method::GetString(input_method.display_name); 610 text += input_method::GetString(input_method.display_name);
606 } 611 }
607 } 612 }
608 DCHECK(!text.empty()); 613 DCHECK(!text.empty());
609 return text; 614 return text;
610 } 615 }
611 616
612 } // namespace chromeos 617 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/language_menu_button.h ('k') | chrome/browser/chromeos/status/network_menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698