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

Unified Diff: chrome/browser/io_thread.cc

Issue 238433003: Provide Shill IP Address to myIpAddress() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Have NetowrkObserver manage its own lifetime Created 6 years, 6 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 | « no previous file | chromeos/chromeos.gyp » ('j') | chromeos/network/host_resolver_impl_chromeos.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 621ab62f84514d9ead273a88758a75eb8b3178b0..418c0fdd1c16747366adfc189a0e8ee4d24f3704 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -101,6 +101,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
+#include "chromeos/network/host_resolver_impl_chromeos.h"
#endif
using content::BrowserThread;
@@ -185,8 +186,15 @@ scoped_ptr<net::HostResolver> CreateGlobalHostResolver(net::NetLog* net_log) {
}
}
- scoped_ptr<net::HostResolver> global_host_resolver(
- net::HostResolver::CreateSystemResolver(options, net_log));
+ scoped_ptr<net::HostResolver> global_host_resolver;
+#if defined OS_CHROMEOS
+ global_host_resolver =
+ chromeos::HostResolverImplChromeOS::CreateSystemResolver(options,
+ net_log);
+#else
+ global_host_resolver =
+ net::HostResolver::CreateSystemResolver(options, net_log);
+#endif
// Determine if we should disable IPv6 support.
if (command_line.HasSwitch(switches::kEnableIPv6)) {
« no previous file with comments | « no previous file | chromeos/chromeos.gyp » ('j') | chromeos/network/host_resolver_impl_chromeos.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698