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

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

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 localized_strings->SetString("advanced_proxy_config", 60 localized_strings->SetString("advanced_proxy_config",
61 l10n_util::GetStringUTF16(IDS_PROXY_ADVANCED_CONFIG)); 61 l10n_util::GetStringUTF16(IDS_PROXY_ADVANCED_CONFIG));
62 localized_strings->SetString("addHost", 62 localized_strings->SetString("addHost",
63 l10n_util::GetStringUTF16(IDS_PROXY_ADD_HOST)); 63 l10n_util::GetStringUTF16(IDS_PROXY_ADD_HOST));
64 localized_strings->SetString("removeHost", 64 localized_strings->SetString("removeHost",
65 l10n_util::GetStringUTF16(IDS_PROXY_REMOVE_HOST)); 65 l10n_util::GetStringUTF16(IDS_PROXY_REMOVE_HOST));
66 localized_strings->SetString("proxyPort", 66 localized_strings->SetString("proxyPort",
67 l10n_util::GetStringUTF16(IDS_PROXY_PORT)); 67 l10n_util::GetStringUTF16(IDS_PROXY_PORT));
68 localized_strings->SetString("proxyBypass", 68 localized_strings->SetString("proxyBypass",
69 l10n_util::GetStringUTF16(IDS_PROXY_BYPASS)); 69 l10n_util::GetStringUTF16(IDS_PROXY_BYPASS));
70 localized_strings->SetString("policyManagedPrefsBannerText",
71 l10n_util::GetStringUTF16(IDS_OPTIONS_POLICY_MANAGED_PREFS));
72 localized_strings->SetString("extensionManagedPrefsBannerText",
73 l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_MANAGED_PREFS));
74 localized_strings->SetString("enableSharedProxiesBannerText",
75 l10n_util::GetStringFUTF16(
76 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT,
77 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));
70 } 78 }
71 79
72 void ProxyHandler::SetNetworkName(const std::string& name) { 80 void ProxyHandler::SetNetworkName(const std::string& name) {
73 StringValue network(name); 81 StringValue network(name);
74 web_ui_->CallJavascriptFunction("options.ProxyOptions.setNetworkName", 82 web_ui_->CallJavascriptFunction("options.ProxyOptions.setNetworkName",
75 network); 83 network);
76 } 84 }
77 85
78 } // namespace chromeos 86 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698