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

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

Issue 11929016: Move jstemplate_builder.* to ui\webui so it can be reused by webui implementations outside of chrom… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to 177705 to get yfriendman's fix Created 7 years, 11 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) 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/proxy_config_service_impl.h" 11 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
12 #include "chrome/browser/chromeos/settings/cros_settings.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/options/chromeos/core_chromeos_options_handler .h" 14 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
15 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" 15 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
16 #include "chrome/browser/ui/webui/web_ui_util.h" 16 #include "chrome/browser/ui/webui/web_ui_util.h"
17 #include "chrome/common/jstemplate_builder.h"
18 #include "chrome/common/url_constants.h" 17 #include "chrome/common/url_constants.h"
19 #include "content/public/browser/url_data_source.h" 18 #include "content/public/browser/url_data_source.h"
20 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
21 #include "content/public/browser/web_ui.h" 20 #include "content/public/browser/web_ui.h"
22 #include "content/public/browser/web_ui_message_handler.h" 21 #include "content/public/browser/web_ui_message_handler.h"
23 #include "grit/browser_resources.h" 22 #include "grit/browser_resources.h"
24 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "ui/webui/jstemplate_builder.h"
25 25
26 using content::WebContents; 26 using content::WebContents;
27 using content::WebUIMessageHandler; 27 using content::WebUIMessageHandler;
28 28
29 namespace { 29 namespace {
30 30
31 class ProxySettingsHTMLSource : public content::URLDataSource { 31 class ProxySettingsHTMLSource : public content::URLDataSource {
32 public: 32 public:
33 explicit ProxySettingsHTMLSource(DictionaryValue* localized_strings); 33 explicit ProxySettingsHTMLSource(DictionaryValue* localized_strings);
34 34
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 core_handler_->InitializePage(); 112 core_handler_->InitializePage();
113 proxy_handler_->InitializePage(); 113 proxy_handler_->InitializePage();
114 Profile* profile = Profile::FromWebUI(web_ui()); 114 Profile* profile = Profile::FromWebUI(web_ui());
115 PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker(); 115 PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();
116 proxy_tracker->UIMakeActiveNetworkCurrent(); 116 proxy_tracker->UIMakeActiveNetworkCurrent();
117 std::string network_name; 117 std::string network_name;
118 proxy_tracker->UIGetCurrentNetworkName(&network_name); 118 proxy_tracker->UIGetCurrentNetworkName(&network_name);
119 } 119 }
120 120
121 } // namespace chromeos 121 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc ('k') | chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698