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

Side by Side Diff: chrome/browser/importer/firefox_proxy_settings.cc

Issue 18501013: Move most importer code to chrome/utility/importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another gyp attempt Created 7 years, 5 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/importer/firefox_proxy_settings.h" 5 #include "chrome/browser/importer/firefox_proxy_settings.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/strings/string_tokenizer.h" 8 #include "base/strings/string_tokenizer.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/importer/firefox_importer_utils.h" 11 #include "chrome/common/importer/firefox_importer_utils.h"
12 #include "net/proxy/proxy_config.h" 12 #include "net/proxy/proxy_config.h"
13 13
14 namespace { 14 namespace {
15 15
16 const char* const kNetworkProxyTypeKey = "network.proxy.type"; 16 const char* const kNetworkProxyTypeKey = "network.proxy.type";
17 const char* const kHTTPProxyKey = "network.proxy.http"; 17 const char* const kHTTPProxyKey = "network.proxy.http";
18 const char* const kHTTPProxyPortKey = "network.proxy.http_port"; 18 const char* const kHTTPProxyPortKey = "network.proxy.http_port";
19 const char* const kSSLProxyKey = "network.proxy.ssl"; 19 const char* const kSSLProxyKey = "network.proxy.ssl";
20 const char* const kSSLProxyPortKey = "network.proxy.ssl_port"; 20 const char* const kSSLProxyPortKey = "network.proxy.ssl_port";
21 const char* const kFTPProxyKey = "network.proxy.ftp"; 21 const char* const kFTPProxyKey = "network.proxy.ftp";
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 while (string_tok.GetNext()) { 218 while (string_tok.GetNext()) {
219 std::string token = string_tok.token(); 219 std::string token = string_tok.token();
220 TrimWhitespaceASCII(token, TRIM_ALL, &token); 220 TrimWhitespaceASCII(token, TRIM_ALL, &token);
221 if (!token.empty()) 221 if (!token.empty())
222 settings->proxy_bypass_list_.push_back(token); 222 settings->proxy_bypass_list_.push_back(token);
223 } 223 }
224 } 224 }
225 } 225 }
226 return true; 226 return true;
227 } 227 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/firefox_importer_utils_win.cc ('k') | chrome/browser/importer/ie_importer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698