| Index: extensions/browser/api/networking_config/networking_config_service.cc
|
| diff --git a/extensions/browser/api/networking_config/networking_config_service.cc b/extensions/browser/api/networking_config/networking_config_service.cc
|
| index 55c90b43889e6a32432f328a7de29a9443272e42..78554033fc7f645958da608bd5513d578c77d4f1 100644
|
| --- a/extensions/browser/api/networking_config/networking_config_service.cc
|
| +++ b/extensions/browser/api/networking_config/networking_config_service.cc
|
| @@ -183,9 +183,8 @@ scoped_ptr<Event> NetworkingConfigService::CreatePortalDetectedEventAndDispatch(
|
| return nullptr;
|
|
|
| // Populate the NetworkInfo object.
|
| - extensions::core_api::networking_config::NetworkInfo network_info;
|
| - network_info.type =
|
| - extensions::core_api::networking_config::NETWORK_TYPE_WIFI;
|
| + extensions::api::networking_config::NetworkInfo network_info;
|
| + network_info.type = extensions::api::networking_config::NETWORK_TYPE_WIFI;
|
| const std::vector<uint8_t>& raw_ssid = network->raw_ssid();
|
| std::string hex_ssid =
|
| base::HexEncode(vector_as_array(&raw_ssid), raw_ssid.size());
|
| @@ -195,12 +194,12 @@ scoped_ptr<Event> NetworkingConfigService::CreatePortalDetectedEventAndDispatch(
|
| if (bssid)
|
| network_info.bssid.reset(new std::string(*bssid));
|
| scoped_ptr<base::ListValue> results =
|
| - extensions::core_api::networking_config::OnCaptivePortalDetected::Create(
|
| + extensions::api::networking_config::OnCaptivePortalDetected::Create(
|
| network_info);
|
| - scoped_ptr<Event> event(new Event(events::UNKNOWN,
|
| - extensions::core_api::networking_config::
|
| - OnCaptivePortalDetected::kEventName,
|
| - results.Pass()));
|
| + scoped_ptr<Event> event(new Event(
|
| + events::UNKNOWN,
|
| + extensions::api::networking_config::OnCaptivePortalDetected::kEventName,
|
| + results.Pass()));
|
| return event.Pass();
|
| }
|
|
|
|
|