diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 17:53:33 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 17:53:33 +0000 |
| commit | 4801879ec26e37c437ab8b9c3f96067a2e0afcb7 (patch) | |
| tree | 55a6866acd28fd4bcd4ac0e9ca53b31e22f0e759 /chrome/browser/prefs | |
| parent | f8742e3ba254518bc11409f7b31288eb6a2e4e5a (diff) | |
| download | chromium_src-4801879ec26e37c437ab8b9c3f96067a2e0afcb7.zip chromium_src-4801879ec26e37c437ab8b9c3f96067a2e0afcb7.tar.gz chromium_src-4801879ec26e37c437ab8b9c3f96067a2e0afcb7.tar.bz2 | |
chromeos: Remove old status-area related code.
This removes --disable-ash-uber-tray from command-line and chrome://flags, and
much of the code that becomes extinct because of this.
BUG=122295
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10056001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index a1bf4ce..4082f01 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -90,8 +90,7 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/preferences.h" #include "chrome/browser/chromeos/proxy_config_service_impl.h" -#include "chrome/browser/chromeos/status/input_method_menu.h" -#include "chrome/browser/chromeos/status/network_menu_button.h" +#include "chrome/browser/chromeos/status/data_promo_notification.h" #include "chrome/browser/policy/auto_enrollment_client.h" #include "chrome/browser/policy/device_status_collector.h" #else @@ -157,7 +156,7 @@ void RegisterLocalState(PrefService* local_state) { #if defined(OS_CHROMEOS) chromeos::AudioHandler::RegisterPrefs(local_state); chromeos::language_prefs::RegisterPrefs(local_state); - chromeos::NetworkMenuButton::RegisterPrefs(local_state); + chromeos::DataPromoNotification::RegisterPrefs(local_state); chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); chromeos::UserManager::RegisterPrefs(local_state); chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |