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

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

Issue 5697005: Change SimpleMenuModel on OSX to support dynamic icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update after merge Created 10 years 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/input_method_menu.h" 5 #include "chrome/browser/chromeos/status/input_method_menu.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 CrosLibrary::Get()->GetInputMethodLibrary()->RemoveObserver(this); 174 CrosLibrary::Get()->GetInputMethodLibrary()->RemoveObserver(this);
175 } 175 }
176 176
177 //////////////////////////////////////////////////////////////////////////////// 177 ////////////////////////////////////////////////////////////////////////////////
178 // menus::MenuModel implementation: 178 // menus::MenuModel implementation:
179 179
180 int InputMethodMenu::GetCommandIdAt(int index) const { 180 int InputMethodMenu::GetCommandIdAt(int index) const {
181 return 0; // dummy 181 return 0; // dummy
182 } 182 }
183 183
184 bool InputMethodMenu::IsLabelDynamicAt(int index) const { 184 bool InputMethodMenu::IsItemDynamicAt(int index) const {
185 // Menu content for the language button could change time by time. 185 // Menu content for the language button could change time by time.
186 return true; 186 return true;
187 } 187 }
188 188
189 bool InputMethodMenu::GetAcceleratorAt( 189 bool InputMethodMenu::GetAcceleratorAt(
190 int index, menus::Accelerator* accelerator) const { 190 int index, menus::Accelerator* accelerator) const {
191 // Views for Chromium OS does not support accelerators yet. 191 // Views for Chromium OS does not support accelerators yet.
192 return false; 192 return false;
193 } 193 }
194 194
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 logged_in_ = true; 611 logged_in_ = true;
612 } 612 }
613 } 613 }
614 614
615 void InputMethodMenu::SetMinimumWidth(int width) { 615 void InputMethodMenu::SetMinimumWidth(int width) {
616 // On the OOBE network selection screen, fixed width menu would be preferable. 616 // On the OOBE network selection screen, fixed width menu would be preferable.
617 minimum_input_method_menu_width_ = width; 617 minimum_input_method_menu_width_ = width;
618 } 618 }
619 619
620 } // namespace chromeos 620 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/input_method_menu.h ('k') | chrome/browser/chromeos/status/network_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698