Index: extensions/browser/api/system_network/system_network_api.cc |
diff --git a/chrome/browser/extensions/api/system_network/system_network_api.cc b/extensions/browser/api/system_network/system_network_api.cc |
similarity index 51% |
rename from chrome/browser/extensions/api/system_network/system_network_api.cc |
rename to extensions/browser/api/system_network/system_network_api.cc |
index 946bde56b1c8fdcaa644f2d629a3dd99273bf4b0..d6296d383b88a6e9f6593c924ee994f8d2602328 100644 |
--- a/chrome/browser/extensions/api/system_network/system_network_api.cc |
+++ b/extensions/browser/api/system_network/system_network_api.cc |
@@ -2,44 +2,52 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/extensions/api/system_network/system_network_api.h" |
+#include "extensions/browser/api/system_network/system_network_api.h" |
namespace { |
const char kNetworkListError[] = "Network lookup failed or unsupported"; |
} // namespace |
namespace extensions { |
-namespace api { |
+namespace core_api { |
SystemNetworkGetNetworkInterfacesFunction:: |
- SystemNetworkGetNetworkInterfacesFunction() {} |
+ SystemNetworkGetNetworkInterfacesFunction() { |
+} |
SystemNetworkGetNetworkInterfacesFunction:: |
- ~SystemNetworkGetNetworkInterfacesFunction() {} |
+ ~SystemNetworkGetNetworkInterfacesFunction() { |
+} |
bool SystemNetworkGetNetworkInterfacesFunction::RunAsync() { |
- content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE, |
- base::Bind(&SystemNetworkGetNetworkInterfacesFunction:: |
- GetListOnFileThread, |
+ content::BrowserThread::PostTask( |
+ content::BrowserThread::FILE, |
+ FROM_HERE, |
+ base::Bind( |
+ &SystemNetworkGetNetworkInterfacesFunction::GetListOnFileThread, |
this)); |
return true; |
} |
void SystemNetworkGetNetworkInterfacesFunction::GetListOnFileThread() { |
net::NetworkInterfaceList interface_list; |
- if (net::GetNetworkList( |
- &interface_list, net::INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES)) { |
- content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, |
- base::Bind(&SystemNetworkGetNetworkInterfacesFunction:: |
- SendResponseOnUIThread, |
- this, interface_list)); |
+ if (net::GetNetworkList(&interface_list, |
+ net::INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES)) { |
+ content::BrowserThread::PostTask( |
+ content::BrowserThread::UI, |
+ FROM_HERE, |
+ base::Bind( |
+ &SystemNetworkGetNetworkInterfacesFunction::SendResponseOnUIThread, |
+ this, |
+ interface_list)); |
return; |
} |
- content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, |
- base::Bind(&SystemNetworkGetNetworkInterfacesFunction:: |
- HandleGetListError, |
- this)); |
+ content::BrowserThread::PostTask( |
+ content::BrowserThread::UI, |
+ FROM_HERE, |
+ base::Bind(&SystemNetworkGetNetworkInterfacesFunction::HandleGetListError, |
+ this)); |
} |
void SystemNetworkGetNetworkInterfacesFunction::HandleGetListError() { |
@@ -52,23 +60,24 @@ void SystemNetworkGetNetworkInterfacesFunction::SendResponseOnUIThread( |
const net::NetworkInterfaceList& interface_list) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
- std::vector<linked_ptr<api::system_network::NetworkInterface> > |
+ std::vector<linked_ptr<core_api::system_network::NetworkInterface> > |
create_arg; |
create_arg.reserve(interface_list.size()); |
for (net::NetworkInterfaceList::const_iterator i = interface_list.begin(); |
- i != interface_list.end(); ++i) { |
- linked_ptr<api::system_network::NetworkInterface> info = |
- make_linked_ptr(new api::system_network::NetworkInterface); |
+ i != interface_list.end(); |
+ ++i) { |
+ linked_ptr<core_api::system_network::NetworkInterface> info = |
+ make_linked_ptr(new core_api::system_network::NetworkInterface); |
info->name = i->name; |
info->address = net::IPAddressToString(i->address); |
info->prefix_length = i->network_prefix; |
create_arg.push_back(info); |
} |
- results_ = api::system_network::GetNetworkInterfaces::Results::Create( |
+ results_ = core_api::system_network::GetNetworkInterfaces::Results::Create( |
create_arg); |
SendResponse(true); |
} |
-} // namespace api |
+} // namespace core_api |
} // namespace extensions |