| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "extensions/browser/api/networking_config/networking_config_api.h" | 9 #include "extensions/browser/api/networking_config/networking_config_api.h" |
| 10 #include "extensions/browser/api/networking_config/networking_config_service.h" | 10 #include "extensions/browser/api/networking_config/networking_config_service.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 api::networking_config::SetNetworkFilter::Params::Create(*args_); | 35 api::networking_config::SetNetworkFilter::Params::Create(*args_); |
| 36 EXTENSION_FUNCTION_VALIDATE(parameters_.get()); | 36 EXTENSION_FUNCTION_VALIDATE(parameters_.get()); |
| 37 | 37 |
| 38 NetworkingConfigService* service = | 38 NetworkingConfigService* service = |
| 39 NetworkingConfigServiceFactory::GetForBrowserContext(browser_context()); | 39 NetworkingConfigServiceFactory::GetForBrowserContext(browser_context()); |
| 40 DCHECK(service); | 40 DCHECK(service); |
| 41 | 41 |
| 42 // Remove previously registered networks. | 42 // Remove previously registered networks. |
| 43 service->UnregisterExtension(extension_id()); | 43 service->UnregisterExtension(extension_id()); |
| 44 | 44 |
| 45 for (linked_ptr<api::networking_config::NetworkInfo>& ni : | 45 for (const api::networking_config::NetworkInfo& ni : parameters_->networks) { |
| 46 parameters_->networks) { | |
| 47 // |Type| field must be set to |WiFi| | 46 // |Type| field must be set to |WiFi| |
| 48 if (ni->type != api::networking_config::NETWORK_TYPE_WIFI) | 47 if (ni.type != api::networking_config::NETWORK_TYPE_WIFI) |
| 49 return RespondNow(Error(kUnsupportedNetworkType)); | 48 return RespondNow(Error(kUnsupportedNetworkType)); |
| 50 | 49 |
| 51 // Either |ssid| or |hex_ssid| must be set. | 50 // Either |ssid| or |hex_ssid| must be set. |
| 52 if (!ni->ssid.get() && !ni->hex_ssid.get()) | 51 if (!ni.ssid.get() && !ni.hex_ssid.get()) |
| 53 return RespondNow(Error(kMalformedFilterDescription)); | 52 return RespondNow(Error(kMalformedFilterDescription)); |
| 54 | 53 |
| 55 std::string hex_ssid; | 54 std::string hex_ssid; |
| 56 if (ni->ssid.get()) { | 55 if (ni.ssid.get()) { |
| 57 auto ssid_field = ni->ssid.get(); | 56 auto ssid_field = ni.ssid.get(); |
| 58 hex_ssid = base::HexEncode(ssid_field->c_str(), ssid_field->size()); | 57 hex_ssid = base::HexEncode(ssid_field->c_str(), ssid_field->size()); |
| 59 } | 58 } |
| 60 if (ni->hex_ssid.get()) | 59 if (ni.hex_ssid.get()) |
| 61 hex_ssid = *ni->hex_ssid.get(); | 60 hex_ssid = *ni.hex_ssid.get(); |
| 62 | 61 |
| 63 if (!service->RegisterHexSsid(hex_ssid, extension_id())) | 62 if (!service->RegisterHexSsid(hex_ssid, extension_id())) |
| 64 return RespondNow(Error(kMalformedFilterDescriptionWithSSID, hex_ssid)); | 63 return RespondNow(Error(kMalformedFilterDescriptionWithSSID, hex_ssid)); |
| 65 } | 64 } |
| 66 | 65 |
| 67 return RespondNow(NoArguments()); | 66 return RespondNow(NoArguments()); |
| 68 } | 67 } |
| 69 | 68 |
| 70 NetworkingConfigSetNetworkFilterFunction:: | 69 NetworkingConfigSetNetworkFilterFunction:: |
| 71 ~NetworkingConfigSetNetworkFilterFunction() { | 70 ~NetworkingConfigSetNetworkFilterFunction() { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 } | 118 } |
| 120 service->SetAuthenticationResult(authentication_result); | 119 service->SetAuthenticationResult(authentication_result); |
| 121 return RespondNow(NoArguments()); | 120 return RespondNow(NoArguments()); |
| 122 } | 121 } |
| 123 | 122 |
| 124 NetworkingConfigFinishAuthenticationFunction:: | 123 NetworkingConfigFinishAuthenticationFunction:: |
| 125 ~NetworkingConfigFinishAuthenticationFunction() { | 124 ~NetworkingConfigFinishAuthenticationFunction() { |
| 126 } | 125 } |
| 127 | 126 |
| 128 } // namespace extensions | 127 } // namespace extensions |
| OLD | NEW |