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

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

Issue 13334007: Added "Use an autoconfiguration URL" checkbox in proxy tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src@git-svn
Patch Set: Fixed conflict in Authors file Created 7 years, 8 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
« no previous file with comments | « chrome/browser/resources/options/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) 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/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 24 matching lines...) Expand all
35 static OptionsStringResource resources[] = { 35 static OptionsStringResource resources[] = {
36 { "proxyPage", IDS_OPTIONS_PROXY_TAB_LABEL }, 36 { "proxyPage", IDS_OPTIONS_PROXY_TAB_LABEL },
37 { "proxyDirectInternetConnection", IDS_PROXY_DIRECT_CONNECTION }, 37 { "proxyDirectInternetConnection", IDS_PROXY_DIRECT_CONNECTION },
38 { "proxyManual", IDS_PROXY_MANUAL_CONFIG }, 38 { "proxyManual", IDS_PROXY_MANUAL_CONFIG },
39 { "sameProxyProtocols", IDS_PROXY_SAME_FORALL }, 39 { "sameProxyProtocols", IDS_PROXY_SAME_FORALL },
40 { "httpProxy", IDS_PROXY_HTTP_PROXY }, 40 { "httpProxy", IDS_PROXY_HTTP_PROXY },
41 { "secureHttpProxy", IDS_PROXY_HTTP_SECURE_HTTP_PROXY }, 41 { "secureHttpProxy", IDS_PROXY_HTTP_SECURE_HTTP_PROXY },
42 { "ftpProxy", IDS_PROXY_FTP_PROXY }, 42 { "ftpProxy", IDS_PROXY_FTP_PROXY },
43 { "socksHost", IDS_PROXY_SOCKS_HOST }, 43 { "socksHost", IDS_PROXY_SOCKS_HOST },
44 { "proxyAutomatic", IDS_PROXY_AUTOMATIC }, 44 { "proxyAutomatic", IDS_PROXY_AUTOMATIC },
45 { "proxyConfigUrl", IDS_PROXY_CONFIG_URL }, 45 { "proxyUseConfigUrl", IDS_PROXY_USE_AUTOCONFIG_URL },
46 { "advancedProxyConfig", IDS_PROXY_ADVANCED_CONFIG }, 46 { "advancedProxyConfig", IDS_PROXY_ADVANCED_CONFIG },
47 { "addHost", IDS_PROXY_ADD_HOST }, 47 { "addHost", IDS_PROXY_ADD_HOST },
48 { "removeHost", IDS_PROXY_REMOVE_HOST }, 48 { "removeHost", IDS_PROXY_REMOVE_HOST },
49 { "proxyPort", IDS_PROXY_PORT }, 49 { "proxyPort", IDS_PROXY_PORT },
50 { "proxyBypass", IDS_PROXY_BYPASS }, 50 { "proxyBypass", IDS_PROXY_BYPASS },
51 { "proxyBannerPolicy", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_POLICY }, 51 { "proxyBannerPolicy", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_POLICY },
52 { "proxyBannerExtension", 52 { "proxyBannerExtension",
53 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_EXTENSION }, 53 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_EXTENSION },
54 { "proxyBannerOther", 54 { "proxyBannerOther",
55 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_OTHER_PRECEDE } 55 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_OTHER_PRECEDE }
56 }; 56 };
57 57
58 RegisterStrings(localized_strings, resources, arraysize(resources)); 58 RegisterStrings(localized_strings, resources, arraysize(resources));
59 59
60 localized_strings->SetString("proxyBannerShared", 60 localized_strings->SetString("proxyBannerShared",
61 l10n_util::GetStringFUTF16( 61 l10n_util::GetStringFUTF16(
62 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_ENABLE_SHARED_HINT, 62 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_ENABLE_SHARED_HINT,
63 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES))); 63 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));
64 } 64 }
65 65
66 } // namespace options 66 } // namespace options
67 } // namespace chromeos 67 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/chromeos/internet_detail.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698