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/ui/ash/networking_config_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| 11 #include "chrome/browser/profiles/profile_manager.h" | 11 #include "chrome/browser/profiles/profile_manager.h" |
| 12 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" | |
| 12 #include "chromeos/network/network_state.h" | 13 #include "chromeos/network/network_state.h" |
| 13 #include "chromeos/network/network_state_handler.h" | 14 #include "chromeos/network/network_state_handler.h" |
| 14 #include "extensions/browser/api/networking_config/networking_config_service.h" | 15 #include "extensions/browser/api/networking_config/networking_config_service.h" |
| 15 #include "extensions/browser/api/networking_config/networking_config_service_fac tory.h" | 16 #include "extensions/browser/api/networking_config/networking_config_service_fac tory.h" |
| 16 #include "extensions/browser/extension_registry.h" | 17 #include "extensions/browser/extension_registry.h" |
| 17 #include "extensions/common/extension.h" | 18 #include "extensions/common/extension.h" |
| 18 | 19 |
| 19 namespace chromeos { | 20 namespace chromeos { |
| 20 | 21 |
| 21 NetworkingConfigDelegateChromeos::NetworkingConfigDelegateChromeos() { | 22 NetworkingConfigDelegateChromeos::NetworkingConfigDelegateChromeos() { |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 44 std::string extension_name = LookUpExtensionName(profile, extension_id); | 45 std::string extension_name = LookUpExtensionName(profile, extension_id); |
| 45 if (extension_name.empty()) | 46 if (extension_name.empty()) |
| 46 return std::unique_ptr< | 47 return std::unique_ptr< |
| 47 const ash::NetworkingConfigDelegate::ExtensionInfo>(); | 48 const ash::NetworkingConfigDelegate::ExtensionInfo>(); |
| 48 std::unique_ptr<const ash::NetworkingConfigDelegate::ExtensionInfo> | 49 std::unique_ptr<const ash::NetworkingConfigDelegate::ExtensionInfo> |
| 49 extension_info(new const ash::NetworkingConfigDelegate::ExtensionInfo( | 50 extension_info(new const ash::NetworkingConfigDelegate::ExtensionInfo( |
| 50 extension_id, extension_name)); | 51 extension_id, extension_name)); |
| 51 return extension_info; | 52 return extension_info; |
| 52 } | 53 } |
| 53 | 54 |
| 55 bool NetworkingConfigDelegateChromeos::HasDefaultNetworkProxyConfigured() { | |
| 56 return NetworkStateInformer::HasDefaultNetworkProxyConfigured(); | |
|
stevenjb
2017/04/20 23:44:55
It looks like the code in NetworkStateInformer::Ha
sammiequon
2017/04/21 00:05:32
I think the problem is the g_browser_process in Ne
| |
| 57 } | |
| 58 | |
| 54 std::string NetworkingConfigDelegateChromeos::LookUpExtensionName( | 59 std::string NetworkingConfigDelegateChromeos::LookUpExtensionName( |
| 55 content::BrowserContext* context, | 60 content::BrowserContext* context, |
| 56 std::string extension_id) const { | 61 std::string extension_id) const { |
| 57 extensions::ExtensionRegistry* extension_registry = | 62 extensions::ExtensionRegistry* extension_registry = |
| 58 extensions::ExtensionRegistry::Get(context); | 63 extensions::ExtensionRegistry::Get(context); |
| 59 DCHECK(extension_registry); | 64 DCHECK(extension_registry); |
| 60 const extensions::Extension* extension = extension_registry->GetExtensionById( | 65 const extensions::Extension* extension = extension_registry->GetExtensionById( |
| 61 extension_id, extensions::ExtensionRegistry::ENABLED); | 66 extension_id, extensions::ExtensionRegistry::ENABLED); |
| 62 if (extension == nullptr) | 67 if (extension == nullptr) |
| 63 return std::string(); | 68 return std::string(); |
| 64 return extension->name(); | 69 return extension->name(); |
| 65 } | 70 } |
| 66 | 71 |
| 67 } // namespace chromeos | 72 } // namespace chromeos |
| OLD | NEW |