Plug ManagedPrefsBanner into chromeos accounts page.

Also fix names around.

BUG=chromium-os:11807
TEST=Manual

Review URL: http://codereview.chromium.org/6532090

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75879 0039d316-1c4b-4281-b951-d872f2087c98

35 files changed, 64 insertions, 35 deletions

diff --git a/chrome/browser/chromeos/webui/accounts_options_handler.cc b/chrome/browser/chromeos/webui/accounts_options_handler.cc
index 3958184..7ec29f0 100644
--- a/chrome/browser/chromeos/webui/accounts_options_handler.cc
+++ b/chrome/browser/chromeos/webui/accounts_options_handler.cc
@@ -11,6 +11,8 @@
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
+#include "chrome/browser/webui/options/options_managed_banner_handler.h"
+#include "chrome/browser/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -123,4 +125,12 @@ void AccountsOptionsHandler::WhitelistExistingUsers(const ListValue* args) {
   web_ui_->CallJavascriptFunction(L"AccountsOptions.addUsers", whitelist_users);
 }
 
+void AccountsOptionsHandler::Initialize() {
+  DCHECK(web_ui_);
+  banner_handler_.reset(
+      new OptionsManagedBannerHandler(web_ui_,
+                                      ASCIIToUTF16("AccountsOptions"),
+                                      OPTIONS_PAGE_ACCOUNTS));
+}
+
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/webui/accounts_options_handler.h b/chrome/browser/chromeos/webui/accounts_options_handler.h
index 4c4fd07..e91b9ef 100644
--- a/chrome/browser/chromeos/webui/accounts_options_handler.h
+++ b/chrome/browser/chromeos/webui/accounts_options_handler.h
@@ -8,6 +8,8 @@
 
 #include "chrome/browser/chromeos/webui/cros_options_page_ui_handler.h"
 
+class OptionsManagedBannerHandler;
+
 namespace chromeos {
 
 class UserCrosSettingsProvider;
@@ -21,8 +23,9 @@ class AccountsOptionsHandler : public CrosOptionsPageUIHandler {
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages();
 
-  // OptionsUIHandler implementation:
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
+  virtual void Initialize();
 
  private:
   UserCrosSettingsProvider* users_settings() const;
@@ -37,6 +40,8 @@ class AccountsOptionsHandler : public CrosOptionsPageUIHandler {
   // Javascript callback to auto add existing users to white list.
   void WhitelistExistingUsers(const ListValue* args);
 
+  scoped_ptr<OptionsManagedBannerHandler> banner_handler_;
+
   DISALLOW_COPY_AND_ASSIGN(AccountsOptionsHandler);
 };
 
diff --git a/chrome/browser/chromeos/webui/cros_language_options_handler.h b/chrome/browser/chromeos/webui/cros_language_options_handler.h
index ac0984a..bf0eba8 100644
--- a/chrome/browser/chromeos/webui/cros_language_options_handler.h
+++ b/chrome/browser/chromeos/webui/cros_language_options_handler.h
@@ -18,7 +18,7 @@ class CrosLanguageOptionsHandler : public LanguageOptionsHandlerCommon {
   CrosLanguageOptionsHandler();
   virtual ~CrosLanguageOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   // DOMMessageHandler implementation.
diff --git a/chrome/browser/chromeos/webui/internet_options_handler.h b/chrome/browser/chromeos/webui/internet_options_handler.h
index 1b98b95..e7b37e7 100644
--- a/chrome/browser/chromeos/webui/internet_options_handler.h
+++ b/chrome/browser/chromeos/webui/internet_options_handler.h
@@ -25,7 +25,7 @@ class InternetOptionsHandler
   InternetOptionsHandler();
   virtual ~InternetOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   // WebUIMessageHandler implementation.
diff --git a/chrome/browser/chromeos/webui/language_chewing_options_handler.h b/chrome/browser/chromeos/webui/language_chewing_options_handler.h
index a512f94..24228cb 100644
--- a/chrome/browser/chromeos/webui/language_chewing_options_handler.h
+++ b/chrome/browser/chromeos/webui/language_chewing_options_handler.h
@@ -18,7 +18,7 @@ class LanguageChewingOptionsHandler : public OptionsPageUIHandler {
   LanguageChewingOptionsHandler();
   virtual ~LanguageChewingOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
  private:
diff --git a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h b/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h
index cc513ff..0a9fd93 100644
--- a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h
+++ b/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h
@@ -17,7 +17,7 @@ class LanguageCustomizeModifierKeysHandler : public OptionsPageUIHandler {
   LanguageCustomizeModifierKeysHandler();
   virtual ~LanguageCustomizeModifierKeysHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
  private:
diff --git a/chrome/browser/chromeos/webui/language_hangul_options_handler.h b/chrome/browser/chromeos/webui/language_hangul_options_handler.h
index 0ca1940..7cf873e 100644
--- a/chrome/browser/chromeos/webui/language_hangul_options_handler.h
+++ b/chrome/browser/chromeos/webui/language_hangul_options_handler.h
@@ -19,7 +19,7 @@ class LanguageHangulOptionsHandler : public OptionsPageUIHandler {
   LanguageHangulOptionsHandler();
   virtual ~LanguageHangulOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
  private:
diff --git a/chrome/browser/chromeos/webui/language_mozc_options_handler.h b/chrome/browser/chromeos/webui/language_mozc_options_handler.h
index 4dc1521..8bf7c6e 100644
--- a/chrome/browser/chromeos/webui/language_mozc_options_handler.h
+++ b/chrome/browser/chromeos/webui/language_mozc_options_handler.h
@@ -18,7 +18,7 @@ class LanguageMozcOptionsHandler : public OptionsPageUIHandler {
   LanguageMozcOptionsHandler();
   virtual ~LanguageMozcOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
  private:
diff --git a/chrome/browser/chromeos/webui/language_pinyin_options_handler.h b/chrome/browser/chromeos/webui/language_pinyin_options_handler.h
index c9c812c..335cc89 100644
--- a/chrome/browser/chromeos/webui/language_pinyin_options_handler.h
+++ b/chrome/browser/chromeos/webui/language_pinyin_options_handler.h
@@ -18,7 +18,7 @@ class LanguagePinyinOptionsHandler : public OptionsPageUIHandler {
   LanguagePinyinOptionsHandler();
   virtual ~LanguagePinyinOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
  private:
diff --git a/chrome/browser/chromeos/webui/proxy_handler.h b/chrome/browser/chromeos/webui/proxy_handler.h
index c467fd5..d531557 100644
--- a/chrome/browser/chromeos/webui/proxy_handler.h
+++ b/chrome/browser/chromeos/webui/proxy_handler.h
@@ -14,7 +14,7 @@ class ProxyHandler : public CrosOptionsPageUIHandler {
   ProxyHandler();
   virtual ~ProxyHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
  private:
diff --git a/chrome/browser/chromeos/webui/stats_options_handler.cc b/chrome/browser/chromeos/webui/stats_options_handler.cc
index c888556..6530f7d 100644
--- a/chrome/browser/chromeos/webui/stats_options_handler.cc
+++ b/chrome/browser/chromeos/webui/stats_options_handler.cc
@@ -19,7 +19,7 @@ StatsOptionsHandler::StatsOptionsHandler()
     : CrosOptionsPageUIHandler(new MetricsCrosSettingsProvider()) {
 }
 
-// OptionsUIHandler implementation.
+// OptionsPageUIHandler implementation.
 void StatsOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
 }
diff --git a/chrome/browser/chromeos/webui/stats_options_handler.h b/chrome/browser/chromeos/webui/stats_options_handler.h
index 06076bc..36b8bf0 100644
--- a/chrome/browser/chromeos/webui/stats_options_handler.h
+++ b/chrome/browser/chromeos/webui/stats_options_handler.h
@@ -20,7 +20,7 @@ class StatsOptionsHandler : public CrosOptionsPageUIHandler {
  public:
   StatsOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void Initialize();
 
diff --git a/chrome/browser/chromeos/webui/system_options_handler.h b/chrome/browser/chromeos/webui/system_options_handler.h
index ed1c7dc..fa36532 100644
--- a/chrome/browser/chromeos/webui/system_options_handler.h
+++ b/chrome/browser/chromeos/webui/system_options_handler.h
@@ -16,7 +16,7 @@ class SystemOptionsHandler : public chromeos::CrosOptionsPageUIHandler {
   SystemOptionsHandler();
   virtual ~SystemOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void Initialize();
 
diff --git a/chrome/browser/policy/managed_prefs_banner_base.cc b/chrome/browser/policy/managed_prefs_banner_base.cc
index 6a32d3f..5e840af 100644
--- a/chrome/browser/policy/managed_prefs_banner_base.cc
+++ b/chrome/browser/policy/managed_prefs_banner_base.cc
@@ -11,6 +11,10 @@
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/cros_settings_names.cc"
+#endif
+
 namespace policy {
 
 ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* user_prefs,
@@ -91,6 +95,15 @@ void ManagedPrefsBannerBase::Init(PrefService* local_state,
       AddUserPref(prefs::kCloudPrintProxyEnabled);
       AddUserPref(prefs::kDownloadDefaultDirectory);
       break;
+#if defined(OS_CHROMEOS)
+    case OPTIONS_PAGE_ACCOUNTS:
+      AddLocalStatePref(chromeos::kAccountsPrefAllowGuest);
+      AddLocalStatePref(chromeos::kAccountsPrefAllowNewUser);
+      AddLocalStatePref(chromeos::kAccountsPrefShowUserNamesOnSignIn);
+      AddLocalStatePref(chromeos::kAccountsPrefUsers);
+      AddLocalStatePref(chromeos::kSystemTimezone);
+      break;
+#endif
     default:
       NOTREACHED();
   }
diff --git a/chrome/browser/ui/options/options_window.h b/chrome/browser/ui/options/options_window.h
index f088f1a..dc451dd 100644
--- a/chrome/browser/ui/options/options_window.h
+++ b/chrome/browser/ui/options/options_window.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -17,6 +17,7 @@ enum OptionsPage {
 #if defined(OS_CHROMEOS)
   OPTIONS_PAGE_SYSTEM,
   OPTIONS_PAGE_INTERNET,
+  OPTIONS_PAGE_ACCOUNTS,
 #endif
   OPTIONS_PAGE_GENERAL,
   OPTIONS_PAGE_CONTENT,
diff --git a/chrome/browser/webui/options/about_page_handler.h b/chrome/browser/webui/options/about_page_handler.h
index eb19a36..0274960 100644
--- a/chrome/browser/webui/options/about_page_handler.h
+++ b/chrome/browser/webui/options/about_page_handler.h
@@ -20,7 +20,7 @@ class AboutPageHandler : public OptionsPageUIHandler {
   AboutPageHandler();
   virtual ~AboutPageHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void RegisterMessages();
 
diff --git a/chrome/browser/webui/options/advanced_options_handler.h b/chrome/browser/webui/options/advanced_options_handler.h
index fccde12..554ac90 100644
--- a/chrome/browser/webui/options/advanced_options_handler.h
+++ b/chrome/browser/webui/options/advanced_options_handler.h
@@ -24,7 +24,7 @@ class AdvancedOptionsHandler
   AdvancedOptionsHandler();
   virtual ~AdvancedOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void Initialize();
 
diff --git a/chrome/browser/webui/options/autofill_options_handler.cc b/chrome/browser/webui/options/autofill_options_handler.cc
index fe3fba8..1ffdad5 100644
--- a/chrome/browser/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/webui/options/autofill_options_handler.cc
@@ -58,7 +58,7 @@ AutoFillOptionsHandler::~AutoFillOptionsHandler() {
 }
 
 /////////////////////////////////////////////////////////////////////////////
-// OptionsUIHandler implementation:
+// OptionsPageUIHandler implementation:
 void AutoFillOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
diff --git a/chrome/browser/webui/options/autofill_options_handler.h b/chrome/browser/webui/options/autofill_options_handler.h
index 2a69fb0..5b559ae 100644
--- a/chrome/browser/webui/options/autofill_options_handler.h
+++ b/chrome/browser/webui/options/autofill_options_handler.h
@@ -19,7 +19,7 @@ class AutoFillOptionsHandler : public OptionsPageUIHandler,
   AutoFillOptionsHandler();
   virtual ~AutoFillOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void Initialize();
   virtual void RegisterMessages();
diff --git a/chrome/browser/webui/options/browser_options_handler.h b/chrome/browser/webui/options/browser_options_handler.h
index 8d66e25..0d2ae95 100644
--- a/chrome/browser/webui/options/browser_options_handler.h
+++ b/chrome/browser/webui/options/browser_options_handler.h
@@ -27,7 +27,7 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,
 
   virtual void Initialize();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void RegisterMessages();
 
diff --git a/chrome/browser/webui/options/certificate_manager_handler.h b/chrome/browser/webui/options/certificate_manager_handler.h
index 143ecaa..031c86c 100644
--- a/chrome/browser/webui/options/certificate_manager_handler.h
+++ b/chrome/browser/webui/options/certificate_manager_handler.h
@@ -25,7 +25,7 @@ class CertificateManagerHandler : public OptionsPageUIHandler,
   CertificateManagerHandler();
   virtual ~CertificateManagerHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void RegisterMessages();
 
diff --git a/chrome/browser/webui/options/clear_browser_data_handler.h b/chrome/browser/webui/options/clear_browser_data_handler.h
index dcf6a1b..b76dd7f 100644
--- a/chrome/browser/webui/options/clear_browser_data_handler.h
+++ b/chrome/browser/webui/options/clear_browser_data_handler.h
@@ -17,7 +17,7 @@ class ClearBrowserDataHandler : public OptionsPageUIHandler,
   ClearBrowserDataHandler();
   virtual ~ClearBrowserDataHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void Initialize();
 
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
diff --git a/chrome/browser/webui/options/content_settings_handler.h b/chrome/browser/webui/options/content_settings_handler.h
index 0fc4a03..5a3349d 100644
--- a/chrome/browser/webui/options/content_settings_handler.h
+++ b/chrome/browser/webui/options/content_settings_handler.h
@@ -20,7 +20,7 @@ class ContentSettingsHandler : public OptionsPageUIHandler {
   ContentSettingsHandler();
   virtual ~ContentSettingsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   virtual void Initialize();
diff --git a/chrome/browser/webui/options/cookies_view_handler.h b/chrome/browser/webui/options/cookies_view_handler.h
index 4a3be06..7b38ec4 100644
--- a/chrome/browser/webui/options/cookies_view_handler.h
+++ b/chrome/browser/webui/options/cookies_view_handler.h
@@ -16,7 +16,7 @@ class CookiesViewHandler : public OptionsPageUIHandler,
   CookiesViewHandler();
   virtual ~CookiesViewHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void RegisterMessages();
 
diff --git a/chrome/browser/webui/options/core_options_handler.h b/chrome/browser/webui/options/core_options_handler.h
index 39b1170..2baecd1 100644
--- a/chrome/browser/webui/options/core_options_handler.h
+++ b/chrome/browser/webui/options/core_options_handler.h
@@ -20,7 +20,7 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
   CoreOptionsHandler();
   virtual ~CoreOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void Uninitialize();
 
diff --git a/chrome/browser/webui/options/font_settings_handler.h b/chrome/browser/webui/options/font_settings_handler.h
index 1890498..152df5a 100644
--- a/chrome/browser/webui/options/font_settings_handler.h
+++ b/chrome/browser/webui/options/font_settings_handler.h
@@ -15,7 +15,7 @@ class FontSettingsHandler : public OptionsPageUIHandler {
   FontSettingsHandler();
   virtual ~FontSettingsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void Initialize();
 
diff --git a/chrome/browser/webui/options/import_data_handler.h b/chrome/browser/webui/options/import_data_handler.h
index 1abc9ed..8cd75e2 100644
--- a/chrome/browser/webui/options/import_data_handler.h
+++ b/chrome/browser/webui/options/import_data_handler.h
@@ -17,7 +17,7 @@ class ImportDataHandler : public OptionsPageUIHandler,
   ImportDataHandler();
   virtual ~ImportDataHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void Initialize();
 
diff --git a/chrome/browser/webui/options/language_options_handler.h b/chrome/browser/webui/options/language_options_handler.h
index 537b83f..49ad655 100644
--- a/chrome/browser/webui/options/language_options_handler.h
+++ b/chrome/browser/webui/options/language_options_handler.h
@@ -15,7 +15,7 @@ class LanguageOptionsHandler : public LanguageOptionsHandlerCommon {
   LanguageOptionsHandler();
   virtual ~LanguageOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   // WebUIMessageHandler implementation.
diff --git a/chrome/browser/webui/options/language_options_handler_common.h b/chrome/browser/webui/options/language_options_handler_common.h
index 15d882f..369be14 100644
--- a/chrome/browser/webui/options/language_options_handler_common.h
+++ b/chrome/browser/webui/options/language_options_handler_common.h
@@ -18,7 +18,7 @@ class LanguageOptionsHandlerCommon : public OptionsPageUIHandler {
   LanguageOptionsHandlerCommon();
   virtual ~LanguageOptionsHandlerCommon();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   // DOMMessageHandler implementation.
diff --git a/chrome/browser/webui/options/options_managed_banner_handler.cc b/chrome/browser/webui/options/options_managed_banner_handler.cc
index 28326aa..25cf5a3 100644
--- a/chrome/browser/webui/options/options_managed_banner_handler.cc
+++ b/chrome/browser/webui/options/options_managed_banner_handler.cc
@@ -14,7 +14,7 @@ OptionsManagedBannerHandler::OptionsManagedBannerHandler(
     : policy::ManagedPrefsBannerBase(web_ui->GetProfile()->GetPrefs(), page),
       web_ui_(web_ui), page_name_(page_name), page_(page) {
   // Initialize the visibility state of the banner.
-  SetupBannerVisibilty();
+  SetupBannerVisibility();
 }
 
 OptionsManagedBannerHandler::~OptionsManagedBannerHandler() {}
@@ -22,10 +22,10 @@ OptionsManagedBannerHandler::~OptionsManagedBannerHandler() {}
 void OptionsManagedBannerHandler::OnUpdateVisibility() {
   // A preference that may be managed has changed.  Update our visibility
   // state.
-  SetupBannerVisibilty();
+  SetupBannerVisibility();
 }
 
-void OptionsManagedBannerHandler::SetupBannerVisibilty() {
+void OptionsManagedBannerHandler::SetupBannerVisibility() {
   // Construct the banner visibility script name.
   string16 script = ASCIIToUTF16("options.") + page_name_ +
       ASCIIToUTF16(".getInstance().setManagedBannerVisibility");
diff --git a/chrome/browser/webui/options/options_managed_banner_handler.h b/chrome/browser/webui/options/options_managed_banner_handler.h
index 052c408..5695e93 100644
--- a/chrome/browser/webui/options/options_managed_banner_handler.h
+++ b/chrome/browser/webui/options/options_managed_banner_handler.h
@@ -27,7 +27,7 @@ class OptionsManagedBannerHandler : public policy::ManagedPrefsBannerBase {
 
  private:
   // Set the managed options banner to be visible or invisible.
-  void SetupBannerVisibilty();
+  void SetupBannerVisibility();
 
   WebUI* web_ui_;  // weak reference to the WebUI.
   string16 page_name_;  // current options page name.
diff --git a/chrome/browser/webui/options/password_manager_handler.h b/chrome/browser/webui/options/password_manager_handler.h
index 0601aa2..5f423e8 100644
--- a/chrome/browser/webui/options/password_manager_handler.h
+++ b/chrome/browser/webui/options/password_manager_handler.h
@@ -16,7 +16,7 @@ class PasswordManagerHandler : public OptionsPageUIHandler {
   PasswordManagerHandler();
   virtual ~PasswordManagerHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   virtual void Initialize();
diff --git a/chrome/browser/webui/options/personal_options_handler.h b/chrome/browser/webui/options/personal_options_handler.h
index 0f52311..992c6d8 100644
--- a/chrome/browser/webui/options/personal_options_handler.h
+++ b/chrome/browser/webui/options/personal_options_handler.h
@@ -21,7 +21,7 @@ class PersonalOptionsHandler : public OptionsPageUIHandler,
   PersonalOptionsHandler();
   virtual ~PersonalOptionsHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
   virtual void Initialize();
 
diff --git a/chrome/browser/webui/options/search_engine_manager_handler.h b/chrome/browser/webui/options/search_engine_manager_handler.h
index 537f836..5a3fbac 100644
--- a/chrome/browser/webui/options/search_engine_manager_handler.h
+++ b/chrome/browser/webui/options/search_engine_manager_handler.h
@@ -20,7 +20,7 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler,
 
   virtual void Initialize();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   // ui::TableModelObserver implementation.
diff --git a/chrome/browser/webui/options/stop_syncing_handler.h b/chrome/browser/webui/options/stop_syncing_handler.h
index 662d0cd..8da6c2e 100644
--- a/chrome/browser/webui/options/stop_syncing_handler.h
+++ b/chrome/browser/webui/options/stop_syncing_handler.h
@@ -13,7 +13,7 @@ class StopSyncingHandler : public OptionsPageUIHandler {
   StopSyncingHandler();
   virtual ~StopSyncingHandler();
 
-  // OptionsUIHandler implementation.
+  // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   // WebUIMessageHandler implementation.