Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/extensions/api/dns/dns_api.h" | 5 #include "chrome/browser/extensions/api/dns/dns_api.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/io_thread.h" | 10 #include "chrome/browser/io_thread.h" |
| 11 #include "chrome/common/extensions/api/experimental.dns.h" | 11 #include "chrome/common/extensions/api/experimental.dns.h" |
| 12 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
| 13 #include "net/base/host_port_pair.h" | 13 #include "net/base/host_port_pair.h" |
| 14 #include "net/base/net_errors.h" | 14 #include "net/base/net_errors.h" |
| 15 #include "net/base/net_util.h" | 15 #include "net/base/net_util.h" |
|
eroman
2012/05/04 01:08:41
can this be removed?
| |
| 16 | 16 |
| 17 using content::BrowserThread; | 17 using content::BrowserThread; |
| 18 using extensions::api::experimental_dns::ResolveCallbackResolveInfo; | 18 using extensions::api::experimental_dns::ResolveCallbackResolveInfo; |
| 19 | 19 |
| 20 namespace Resolve = extensions::api::experimental_dns::Resolve; | 20 namespace Resolve = extensions::api::experimental_dns::Resolve; |
| 21 | 21 |
| 22 namespace extensions { | 22 namespace extensions { |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 void DnsResolveFunction::RespondOnUIThread() { | 89 void DnsResolveFunction::RespondOnUIThread() { |
| 90 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 90 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 91 SendResponse(response_); | 91 SendResponse(response_); |
| 92 } | 92 } |
| 93 | 93 |
| 94 void DnsResolveFunction::OnLookupFinished(int resolve_result) { | 94 void DnsResolveFunction::OnLookupFinished(int resolve_result) { |
| 95 scoped_ptr<ResolveCallbackResolveInfo> resolve_info( | 95 scoped_ptr<ResolveCallbackResolveInfo> resolve_info( |
| 96 new ResolveCallbackResolveInfo()); | 96 new ResolveCallbackResolveInfo()); |
| 97 resolve_info->result_code = resolve_result; | 97 resolve_info->result_code = resolve_result; |
| 98 if (resolve_result == net::OK) { | 98 if (resolve_result == net::OK) { |
| 99 const struct addrinfo* head = addresses_->head(); | 99 DCHECK(!addresses_->empty()); |
| 100 DCHECK(head); | |
| 101 resolve_info->address.reset( | 100 resolve_info->address.reset( |
| 102 new std::string(net::NetAddressToString(head))); | 101 new std::string(addresses_->front().ToStringWithoutPort())); |
| 103 } | 102 } |
| 104 result_.reset(Resolve::Result::Create(*resolve_info)); | 103 result_.reset(Resolve::Result::Create(*resolve_info)); |
| 105 response_ = true; | 104 response_ = true; |
| 106 | 105 |
| 107 bool post_task_result = BrowserThread::PostTask( | 106 bool post_task_result = BrowserThread::PostTask( |
| 108 BrowserThread::UI, FROM_HERE, | 107 BrowserThread::UI, FROM_HERE, |
| 109 base::Bind(&DnsResolveFunction::RespondOnUIThread, this)); | 108 base::Bind(&DnsResolveFunction::RespondOnUIThread, this)); |
| 110 DCHECK(post_task_result); | 109 DCHECK(post_task_result); |
| 111 | 110 |
| 112 Release(); // Added in WorkOnIOThread(). | 111 Release(); // Added in WorkOnIOThread(). |
| 113 } | 112 } |
| 114 | 113 |
| 115 } // namespace extensions | 114 } // namespace extensions |
| OLD | NEW |