chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc - Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed Mattias' comments. Created 7 years, 7 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

« chrome/browser/ui/webui/chromeos/login/network_state_informer.cc ('K') | « chrome/browser/ui/webui/chromeos/login/network_state_informer.cc ('k') | chromeos/network/managed_state.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 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/ref_counted_memory.h"	7 #include "base/memory/ref_counted_memory.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

10 #include "base/values.h"	10 #include "base/values.h"

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119 proxy_handler_->Uninitialize();	119 proxy_handler_->Uninitialize();

120 }	120 }

121	121

122 void ProxySettingsUI::InitializeHandlers() {	122 void ProxySettingsUI::InitializeHandlers() {

123 core_handler_->InitializeHandler();	123 core_handler_->InitializeHandler();

124 proxy_handler_->InitializeHandler();	124 proxy_handler_->InitializeHandler();

125 core_handler_->InitializePage();	125 core_handler_->InitializePage();

126 proxy_handler_->InitializePage();	126 proxy_handler_->InitializePage();

127 Profile* profile = Profile::FromWebUI(web_ui());	127 Profile* profile = Profile::FromWebUI(web_ui());

128 PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();	128 PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();

129 proxy_tracker->UIMakeActiveNetworkCurrent();	129 proxy_tracker->UIMakeDefaultNetworkCurrent();

130 std::string network_name;	130 std::string network_name;

131 proxy_tracker->UIGetCurrentNetworkName(&network_name);	131 proxy_tracker->UIGetCurrentNetworkName(&network_name);

132 }	132 }

133	133

134 } // namespace chromeos	134 } // namespace chromeos

OLD	NEW