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

Unified Diff: chrome/browser/net/connection_tester.cc

Issue 9559014: Exclude browser/importer from Android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/bookmarks/bookmark_extension_api.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/connection_tester.cc
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 00e7482d8e9062cda4f1c80383d70c8638ec0e7e..ced2e151dd21613f7b214ba2909b39c5210f4780 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -227,6 +227,10 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
// code.
int CreateFirefoxProxyConfigService(
scoped_ptr<net::ProxyConfigService>* config_service) {
+#if defined(OS_ANDROID)
+ // Chrome on Android does not support Firefox settings.
+ return net::ERR_FAILED;
Yaron 2012/03/01 02:20:31 Looking above, it seems like theres' precedent for
+#else
// Fetch Firefox's proxy settings (can fail if Firefox is not installed).
FirefoxProxySettings firefox_settings;
if (!FirefoxProxySettings::GetSettings(&firefox_settings))
@@ -242,6 +246,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
}
return net::ERR_FAILED;
+#endif
}
const scoped_refptr<net::URLRequestContext> proxy_request_context_;
« no previous file with comments | « chrome/browser/bookmarks/bookmark_extension_api.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698