Componentize proxy code from chrome/browser/net

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 <set>
 #include <string>
 #include <vector>
 
@@ skipping 56 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/proximity_auth/switches.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/ui/zoom/page_zoom.h"
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 889 matching lines @@
         policy::key::kWallpaperImage,
         base::Bind(&BrowserOptionsHandler::OnWallpaperPolicyChanged,
                    base::Unretained(this)));
   }
   chromeos::CrosSettings::Get()->AddSettingsObserver(
       chromeos::kSystemTimezonePolicy,
       base::Bind(&BrowserOptionsHandler::OnSystemTimezonePolicyChanged,
                  weak_ptr_factory_.GetWeakPtr()));
 #else  // !defined(OS_CHROMEOS)
   profile_pref_registrar_.Add(
-      prefs::kProxy,
+      proxy_config::prefs::kProxy,
       base::Bind(&BrowserOptionsHandler::SetupProxySettingsSection,
                  base::Unretained(this)));
 #endif  // !defined(OS_CHROMEOS)
 }
 
 void BrowserOptionsHandler::InitializePage() {
   page_initialized_ = true;
 
   OnTemplateURLServiceChanged();
 
@@ skipping 1042 matching lines @@
   // by an extension, or the browser is running in Windows Ash (on Windows the
   // proxy settings dialog will open on the Windows desktop and be invisible
   // to a user in Ash).
   bool is_win_ash = false;
 #if defined(OS_WIN)
   chrome::HostDesktopType desktop_type = helper::GetDesktopType(web_ui());
   is_win_ash = (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH);
 #endif
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   const PrefService::Preference* proxy_config =
-      pref_service->FindPreference(prefs::kProxy);
+      pref_service->FindPreference(proxy_config::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",
                                    disabled, extension_controlled);
 
 #if defined(OS_WIN)
@@ skipping 117 matching lines @@
 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                             const policy::PolicyMap& previous,
                                             const policy::PolicyMap& current) {
   std::set<std::string> different_keys;
   current.GetDifferingKeys(previous, &different_keys);
   if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
     SetupMetricsReportingCheckbox();
 }
 
 }  // namespace options