| 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 "ash/system/chromeos/network/vpn_list_view.h" | 5 #include "ash/system/chromeos/network/vpn_list_view.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "ash/common/system/tray/system_tray_delegate.h" | 11 #include "ash/common/system/tray/system_tray_delegate.h" |
| 12 #include "ash/common/system/tray/tray_constants.h" |
| 12 #include "ash/metrics/user_metrics_recorder.h" | 13 #include "ash/metrics/user_metrics_recorder.h" |
| 13 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 14 #include "ash/system/chromeos/network/vpn_delegate.h" | 15 #include "ash/system/chromeos/network/vpn_delegate.h" |
| 15 #include "ash/system/tray/hover_highlight_view.h" | 16 #include "ash/system/tray/hover_highlight_view.h" |
| 16 #include "ash/system/tray/tray_constants.h" | |
| 17 #include "ash/system/tray/tray_popup_label_button.h" | 17 #include "ash/system/tray/tray_popup_label_button.h" |
| 18 #include "base/bind.h" | 18 #include "base/bind.h" |
| 19 #include "base/bind_helpers.h" | 19 #include "base/bind_helpers.h" |
| 20 #include "base/logging.h" | 20 #include "base/logging.h" |
| 21 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
| 22 #include "base/values.h" | 22 #include "base/values.h" |
| 23 #include "chromeos/network/network_connection_handler.h" | 23 #include "chromeos/network/network_connection_handler.h" |
| 24 #include "chromeos/network/network_handler.h" | 24 #include "chromeos/network/network_handler.h" |
| 25 #include "chromeos/network/network_state.h" | 25 #include "chromeos/network/network_state.h" |
| 26 #include "chromeos/network/network_type_pattern.h" | 26 #include "chromeos/network/network_type_pattern.h" |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 } | 413 } |
| 414 } | 414 } |
| 415 | 415 |
| 416 // Add providers without any configured networks, in the order that the | 416 // Add providers without any configured networks, in the order that the |
| 417 // providers were returned by the extensions system. | 417 // providers were returned by the extensions system. |
| 418 for (const VPNProvider& provider : providers) | 418 for (const VPNProvider& provider : providers) |
| 419 AddProviderAndNetworks(provider.key, provider.name, networks); | 419 AddProviderAndNetworks(provider.key, provider.name, networks); |
| 420 } | 420 } |
| 421 | 421 |
| 422 } // namespace ash | 422 } // namespace ash |
| OLD | NEW |