redesign and reimplement proxy config service and tracker, revise proxy ui on cros

chrome/browser/ui/webui/options/core_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/plugin_data_remover_helper.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 
 // Core options UI handler.
 // Handles resource and JS calls common to all options sub-pages.
 class CoreOptionsHandler : public OptionsPageUIHandler {
  public:
   CoreOptionsHandler();
   virtual ~CoreOptionsHandler();
 
   // OptionsPageUIHandler implementation.
@@ skipping 34 matching lines @@
   // Clears pref value for given |pref_name|.
   void ClearPref(const std::string& pref_name, const std::string& metric);
 
   // Stops observing given preference identified by |path|.
   virtual void StopObservingPref(const std::string& path);
 
   // Records a user metric action for the given value.
   void ProcessUserMetric(const Value* value,
                          const std::string& metric);
 
+  // Notifies registered JS callbacks on change in |pref_name| preference.
+  // |controlling_pref_name| controls if |pref_name| is managed by
+  // policy/extension; empty |controlling_pref_name| indicates no other pref is
+  // controlling |pref_name|.
+  void NotifyPrefChanged(const std::string& pref_name,
+                         const std::string& controlling_pref_name);
+
+  // Creates dictioary value for |pref|, |controlling_pref| controls if |pref|

[Mattias Nissler (ping if slow), 2011/10/19 19:27:36]

s/dictioary/dictionary/

[kuan, 2011/10/20 00:41:11]

Done.

+  // is managed by policy/managed; NULL indicates no ordher pref is controlling

[Mattias Nissler (ping if slow), 2011/10/19 19:27:36]

s/ordher/other/

[kuan, 2011/10/20 00:41:11]

Done.

+  // |pref|.
+  DictionaryValue* CreateValueForPref(const PrefService::Preference* pref,
+      const PrefService::Preference* controlling_pref);

[Mattias Nissler (ping if slow), 2011/10/19 19:27:36]

parameters should be aligned.

[kuan, 2011/10/20 00:41:11]

Done.

+
   typedef std::multimap<std::string, std::wstring> PreferenceCallbackMap;
   PreferenceCallbackMap pref_callback_map_;
+
  private:
   // Type of preference value received from the page. This doesn't map 1:1 to
   // Value::Type, since a TYPE_STRING can require custom processing.
   enum PrefType {
     TYPE_BOOLEAN = 0,
     TYPE_INTEGER,
     TYPE_DOUBLE,
     TYPE_STRING,
     TYPE_URL,
     TYPE_LIST,
@@ skipping 34 matching lines @@
   //  item 1 - name of the metric identifier (optional).
   void HandleClearPref(const ListValue* args);
 
   // Callback for the "coreOptionsUserMetricsAction" message.  This records
   // an action that should be tracked if metrics recording is enabled. |args|
   // is an array that contains a single item, the name of the metric identifier.
   void HandleUserMetricsAction(const ListValue* args);
 
   void UpdateClearPluginLSOData();
 
-  void NotifyPrefChanged(const std::string* pref_name);
-
   OptionsPageUIHandlerHost* handlers_host_;
   PrefChangeRegistrar registrar_;
 
   // Used for asynchronously updating the preference stating whether clearing
   // LSO data is supported.
   PluginDataRemoverHelper clear_plugin_lso_data_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(CoreOptionsHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CORE_OPTIONS_HANDLER_H_