| Index: chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc
|
| index e45969cc5aa325ab9fc8a4609acfd4c706b8ecc9..3ce04aa56b153eb3d038864ca6f47a2d5ec12d9f 100644
|
| --- a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc
|
| @@ -111,7 +111,7 @@ CoreChromeOSOptionsHandler::~CoreChromeOSOptionsHandler() {
|
| pointer_factory_.GetWeakPtr()));
|
| }
|
|
|
| -void CoreChromeOSOptionsHandler::Initialize() {
|
| +void CoreChromeOSOptionsHandler::InitializeHandler() {
|
| proxy_prefs_.reset(PrefSetObserver::CreateProxyPrefSetObserver(
|
| Profile::FromWebUI(web_ui())->GetPrefs(), this));
|
| // Observe the chromeos::ProxyConfigServiceImpl for changes from the UI.
|
| @@ -122,6 +122,11 @@ void CoreChromeOSOptionsHandler::Initialize() {
|
| pointer_factory_.GetWeakPtr()));
|
| }
|
|
|
| +void CoreChromeOSOptionsHandler::InitializePage() {
|
| + // NOTE: Don't remove this, we're intentionally ignoring the base class'
|
| + // implementation of InitializePage.
|
| +}
|
| +
|
| base::Value* CoreChromeOSOptionsHandler::FetchPref(
|
| const std::string& pref_name) {
|
| if (proxy_cros_settings_parser::IsProxyPref(pref_name)) {
|
|
|