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

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

Issue 9702011: Migrate proxy-settings.html to options2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright notices. Created 8 years, 9 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
« no previous file with comments | « chrome/browser/resources/options2/chromeos/internet_detail.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 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/options2/chromeos/proxy_handler2.h" 5 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.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"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_MANAGED_PREFS)); 73 l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_MANAGED_PREFS));
74 localized_strings->SetString("unmodifiablePrefsBannerText", 74 localized_strings->SetString("unmodifiablePrefsBannerText",
75 l10n_util::GetStringUTF16(IDS_OPTIONS_UNMODIFIABLE_PREFS)); 75 l10n_util::GetStringUTF16(IDS_OPTIONS_UNMODIFIABLE_PREFS));
76 localized_strings->SetString("enableSharedProxiesBannerText", 76 localized_strings->SetString("enableSharedProxiesBannerText",
77 l10n_util::GetStringFUTF16( 77 l10n_util::GetStringFUTF16(
78 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT, 78 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT,
79 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES))); 79 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));
80 } 80 }
81 81
82 void ProxyHandler::SetNetworkName(const std::string& name) { 82 void ProxyHandler::SetNetworkName(const std::string& name) {
83 StringValue network(name); 83 // Not used in options2 version of the handler.
84 web_ui()->CallJavascriptFunction("options.ProxyOptions.setNetworkName",
85 network);
86 } 84 }
87 85
88 } // namespace options2 86 } // namespace options2
89 } // namespace chromeos 87 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/chromeos/internet_detail.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698