chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

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 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 4 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

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"

11 #include "chrome/browser/chromeos/cros_settings.h"

12 #include "chrome/browser/chromeos/proxy_config_service_impl.h"	11 #include "chrome/browser/chromeos/proxy_config_service_impl.h"

	12 #include "chrome/browser/chromeos/settings/cros_settings.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"	14 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

15 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handle r.h"	15 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handle r.h"

16 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler.h"	16 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler.h"

17 #include "chrome/common/jstemplate_builder.h"	17 #include "chrome/common/jstemplate_builder.h"

18 #include "chrome/common/url_constants.h"	18 #include "chrome/common/url_constants.h"

19 #include "content/public/browser/web_contents.h"	19 #include "content/public/browser/web_contents.h"

20 #include "content/public/browser/web_ui.h"	20 #include "content/public/browser/web_ui.h"

21 #include "content/public/browser/web_ui_message_handler.h"	21 #include "content/public/browser/web_ui_message_handler.h"

22 #include "grit/browser_resources.h"	22 #include "grit/browser_resources.h"

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107 core_handler_->InitializePage();	107 core_handler_->InitializePage();

108 proxy_handler_->InitializePage();	108 proxy_handler_->InitializePage();

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

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

111 proxy_tracker->UIMakeActiveNetworkCurrent();	111 proxy_tracker->UIMakeActiveNetworkCurrent();

112 std::string network_name;	112 std::string network_name;

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

114 }	114 }

115	115

116 } // namespace chromeos	116 } // namespace chromeos

OLD	NEW