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

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

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed the comments from Denis. Created 9 years, 3 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) 2011 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/options/chromeos/proxy_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/chromeos/proxy_cros_settings_provider.h"
14 #include "grit/chromium_strings.h" 13 #include "grit/chromium_strings.h"
15 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
16 #include "grit/locale_settings.h" 15 #include "grit/locale_settings.h"
17 #include "grit/theme_resources.h" 16 #include "grit/theme_resources.h"
18 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
20 19
21 namespace chromeos { 20 namespace chromeos {
22 21
23 ProxyHandler::ProxyHandler() 22 ProxyHandler::ProxyHandler() {
24 : CrosOptionsPageUIHandler(new ProxyCrosSettingsProvider()) {
25 } 23 }
26 24
27 ProxyHandler::~ProxyHandler() { 25 ProxyHandler::~ProxyHandler() {
28 } 26 }
29 27
30 void ProxyHandler::GetLocalizedValues( 28 void ProxyHandler::GetLocalizedValues(
31 DictionaryValue* localized_strings) { 29 DictionaryValue* localized_strings) {
32 DCHECK(localized_strings); 30 DCHECK(localized_strings);
33 // Proxy page - ChromeOS 31 // Proxy page - ChromeOS
34 localized_strings->SetString("proxyPage", 32 localized_strings->SetString("proxyPage",
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 l10n_util::GetStringUTF16(IDS_PROXY_BYPASS)); 67 l10n_util::GetStringUTF16(IDS_PROXY_BYPASS));
70 } 68 }
71 69
72 void ProxyHandler::SetNetworkName(const std::string& name) { 70 void ProxyHandler::SetNetworkName(const std::string& name) {
73 StringValue network(name); 71 StringValue network(name);
74 web_ui_->CallJavascriptFunction("options.ProxyOptions.setNetworkName", 72 web_ui_->CallJavascriptFunction("options.ProxyOptions.setNetworkName",
75 network); 73 network);
76 } 74 }
77 75
78 } // namespace chromeos 76 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698