diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 09:21:00 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 09:21:00 +0000 |
| commit | 106ccd2ccd1ac30217f27541b515c4bb93f10707 (patch) | |
| tree | 5e1051f37501d9894d47853529a8b564dd8da614 /chrome/browser/io_thread.cc | |
| parent | ecf56301956369d9fa0f341a0001efe9efbc1cbd (diff) | |
| download | chromium_src-106ccd2ccd1ac30217f27541b515c4bb93f10707.zip chromium_src-106ccd2ccd1ac30217f27541b515c4bb93f10707.tar.gz chromium_src-106ccd2ccd1ac30217f27541b515c4bb93f10707.tar.bz2 | |
Provide Shill IP Address to myIpAddress()
On Chrome OS we need to get the IP Address to use for myIpAddress() from Shill since gethostname() returns localhost.
BUG=175652
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/238433003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 277f4ff..3a9860c 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)) { |