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