Revert 275229 "Add an extension override bubble and warning box ..."

trunk/src/chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/app_window.h"
@@ skipping 291 matching lines @@
       IDS_RESET_PROFILE_SETTINGS_DESCRIPTION },
     { "resetProfileSettingsSectionTitle",
       IDS_RESET_PROFILE_SETTINGS_SECTION_TITLE },
     { "safeBrowsingEnableProtection",
       IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
     { "safeBrowsingEnableDownloadFeedback",
       IDS_OPTIONS_SAFEBROWSING_ENABLEDOWNLOADFEEDBACK },
     { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
     { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
     { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
-    { "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME },
     { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
     { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
     { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
     { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
     { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE },
     { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE },
     { "spellingPref", IDS_OPTIONS_SPELLING_PREF },
     { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION },
     { "settingsTitle", IDS_SETTINGS_TITLE },
     { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS },
@@ skipping 1378 matching lines @@
 #endif
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   const PrefService::Preference* proxy_config =
       pref_service->FindPreference(prefs::kProxy);
   bool is_extension_controlled = (proxy_config &&
                                   proxy_config->IsExtensionControlled());
 
   base::FundamentalValue disabled(is_win_ash || (proxy_config &&
                                   !proxy_config->IsUserModifiable()));
   base::FundamentalValue extension_controlled(is_extension_controlled);
-  web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsButton",
+  web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
                                    disabled, extension_controlled);
 
-#if defined(OS_WIN)
-  SetupExtensionControlledIndicators();
-#endif  // defined(OS_WIN)
-
 #endif  // !defined(OS_CHROMEOS)
 }
 
 void BrowserOptionsHandler::SetupManageCertificatesSection() {
 #if defined(OS_WIN)
   // Disable the button if the settings page is displayed in Windows Ash,
   // otherwise the proxy settings dialog will open on the Windows desktop and
   // be invisible to a user in Ash.
   if (helper::GetDesktopType(web_ui()) == chrome::HOST_DESKTOP_TYPE_ASH) {
     base::FundamentalValue enabled(false);
@@ skipping 19 matching lines @@
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.updateEasyUnlock",
       has_pairing_value);
 }
 
 void BrowserOptionsHandler::SetupExtensionControlledIndicators() {
 #if defined(OS_WIN)
   base::DictionaryValue extension_controlled;
 
   // Check if an extension is overriding the Search Engine.
-  const extensions::Extension* extension =
-      extensions::GetExtensionOverridingSearchEngine(
-          Profile::FromWebUI(web_ui()), NULL);
+  const extensions::Extension* extension = extensions::OverridesSearchEngine(
+      Profile::FromWebUI(web_ui()), NULL);
   AppendExtensionData("searchEngine", extension, &extension_controlled);
 
   // Check if an extension is overriding the Home page.
-  extension = extensions::GetExtensionOverridingHomepage(
-      Profile::FromWebUI(web_ui()), NULL);
+  extension = extensions::OverridesHomepage(Profile::FromWebUI(web_ui()), NULL);
   AppendExtensionData("homePage", extension, &extension_controlled);
 
   // Check if an extension is overriding the Startup pages.
-  extension = extensions::GetExtensionOverridingStartupPages(
+  extension = extensions::OverridesStartupPages(
       Profile::FromWebUI(web_ui()), NULL);
   AppendExtensionData("startUpPage", extension, &extension_controlled);
 
   // Check if an extension is overriding the NTP page.
   GURL ntp_url(chrome::kChromeUINewTabURL);
   bool ignored_param;
   extension = NULL;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &ntp_url,
       web_ui()->GetWebContents()->GetBrowserContext(),
       &ignored_param);
   if (ntp_url.SchemeIs("chrome-extension")) {
     using extensions::ExtensionRegistry;
     ExtensionRegistry* registry = ExtensionRegistry::Get(
         Profile::FromWebUI(web_ui()));
     extension = registry->GetExtensionById(ntp_url.host(),
                                            ExtensionRegistry::ENABLED);
   }
   AppendExtensionData("newTabPage", extension, &extension_controlled);
 
-  // Check if an extension is overwriting the proxy setting.
-  extension = extensions::GetExtensionOverridingProxy(
-      Profile::FromWebUI(web_ui()));
-  AppendExtensionData("proxy", extension, &extension_controlled);
-
   web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
                                    extension_controlled);
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace options