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

Unified Diff: chrome/browser/chromeos/status/input_method_menu.h

Issue 6262012: Remove multiple inheritance from input_method_menu_button.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/input_method_menu.h
diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h
index 4045293b283277b2a922ff5c5b98aa6f5777320f..6227abf3715ed8d684f65ae4441456289472f119 100644
--- a/chrome/browser/chromeos/status/input_method_menu.h
+++ b/chrome/browser/chromeos/status/input_method_menu.h
@@ -97,10 +97,6 @@ class InputMethodMenu : public views::ViewMenuDelegate,
static std::wstring GetTextForMenu(const InputMethodDescriptor& input_method);
protected:
- // Parses |input_method| and then calls UpdateUI().
- void UpdateUIFromInputMethod(const InputMethodDescriptor& input_method,
- size_t num_active_input_methods);
-
// Rebuilds model and menu2 objects in preparetion to open the menu.
void PrepareForMenuOpen();
@@ -126,6 +122,10 @@ class InputMethodMenu : public views::ViewMenuDelegate,
// customizing languages and input.
virtual void OpenConfigUI() = 0;
+ // Parses |input_method| and then calls UpdateUI().
+ void UpdateUIFromInputMethod(const InputMethodDescriptor& input_method,
+ size_t num_active_input_methods);
+
// Rebuilds |model_|. This function should be called whenever
// |input_method_descriptors_| is updated, or ImePropertiesChanged() is
// called.
« no previous file with comments | « chrome/browser/chromeos/login/keyboard_switch_menu.cc ('k') | chrome/browser/chromeos/status/input_method_menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698