Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1006)

Side by Side Diff: chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

Issue 9693032: [uber page] Split up initialization of handlers from initialization of webui pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyright bumps Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/cros_settings.h" 10 #include "chrome/browser/chromeos/cros_settings.h"
11 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 11 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 90 }
91 91
92 ProxySettingsUI::~ProxySettingsUI() { 92 ProxySettingsUI::~ProxySettingsUI() {
93 // Uninitialize all registered handlers. The base class owns them and it will 93 // Uninitialize all registered handlers. The base class owns them and it will
94 // eventually delete them. 94 // eventually delete them.
95 core_handler_->Uninitialize(); 95 core_handler_->Uninitialize();
96 proxy_handler_->Uninitialize(); 96 proxy_handler_->Uninitialize();
97 } 97 }
98 98
99 void ProxySettingsUI::InitializeHandlers() { 99 void ProxySettingsUI::InitializeHandlers() {
100 core_handler_->Initialize(); 100 core_handler_->InitializeHandler();
101 proxy_handler_->Initialize(); 101 proxy_handler_->InitializeHandler();
102 core_handler_->InitializePage();
103 proxy_handler_->InitializePage();
102 Profile* profile = Profile::FromWebUI(web_ui()); 104 Profile* profile = Profile::FromWebUI(web_ui());
103 PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker(); 105 PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();
104 proxy_tracker->UIMakeActiveNetworkCurrent(); 106 proxy_tracker->UIMakeActiveNetworkCurrent();
105 std::string network_name; 107 std::string network_name;
106 proxy_tracker->UIGetCurrentNetworkName(&network_name); 108 proxy_tracker->UIGetCurrentNetworkName(&network_name);
107 proxy_handler_->SetNetworkName(network_name); 109 proxy_handler_->SetNetworkName(network_name);
108 } 110 }
109 111
110 } // namespace chromeos 112 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/uber/uber_frame.js ('k') | chrome/browser/ui/webui/options/advanced_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698