diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-25 05:06:35 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-25 05:06:35 +0000 |
| commit | f3964ad144ead73929d06441910a26994879377f (patch) | |
| tree | 27d3d07165bf075c117b68875f56c518fef08036 /chrome/browser/prefs | |
| parent | 57b26b167e12b0ef1b98adba77ce4622962a4c8e (diff) | |
| download | chromium_src-f3964ad144ead73929d06441910a26994879377f.zip chromium_src-f3964ad144ead73929d06441910a26994879377f.tar.gz chromium_src-f3964ad144ead73929d06441910a26994879377f.tar.bz2 | |
Remove multiple inheritance from input_method_menu_button.h.
Currently chromeos::InputMethodMenuButton is derived from both StatusAreaButton and InputMethodMenu, which violates the Chrome coding guideline. This change removes the multiple inheritance by adding InputMethodMenu object to InputMethodMenuButton as a member variable.
BUG=chromium-os:7572
TEST=manually & try bot
Review URL: http://codereview.chromium.org/6262012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 8253246..f47187e 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -72,7 +72,7 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/preferences.h" -#include "chrome/browser/chromeos/status/input_method_menu_button.h" +#include "chrome/browser/chromeos/status/input_method_menu.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" #endif @@ -110,7 +110,7 @@ void RegisterLocalState(PrefService* local_state) { chromeos::UserManager::RegisterPrefs(local_state); chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); WizardController::RegisterPrefs(local_state); - chromeos::InputMethodMenuButton::RegisterPrefs(local_state); + chromeos::InputMethodMenu::RegisterPrefs(local_state); chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); #endif |