Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: ash/system/network/vpn_list_view.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/system/network/tray_vpn.cc ('k') | ash/system/overview/overview_button_tray.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/network/vpn_list_view.h" 5 #include "ash/system/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/ash_view_ids.h" 11 #include "ash/ash_view_ids.h"
12 #include "ash/common/material_design/material_design_controller.h" 12 #include "ash/material_design/material_design_controller.h"
13 #include "ash/common/wm_shell.h"
14 #include "ash/resources/vector_icons/vector_icons.h" 13 #include "ash/resources/vector_icons/vector_icons.h"
15 #include "ash/strings/grit/ash_strings.h" 14 #include "ash/strings/grit/ash_strings.h"
16 #include "ash/system/network/network_icon.h" 15 #include "ash/system/network/network_icon.h"
17 #include "ash/system/network/network_icon_animation.h" 16 #include "ash/system/network/network_icon_animation.h"
18 #include "ash/system/network/network_icon_animation_observer.h" 17 #include "ash/system/network/network_icon_animation_observer.h"
19 #include "ash/system/network/network_list_delegate.h" 18 #include "ash/system/network/network_list_delegate.h"
20 #include "ash/system/network/vpn_list.h" 19 #include "ash/system/network/vpn_list.h"
21 #include "ash/system/tray/hover_highlight_view.h" 20 #include "ash/system/tray/hover_highlight_view.h"
22 #include "ash/system/tray/system_menu_button.h" 21 #include "ash/system/tray/system_menu_button.h"
23 #include "ash/system/tray/system_tray_controller.h" 22 #include "ash/system/tray/system_tray_controller.h"
24 #include "ash/system/tray/throbber_view.h" 23 #include "ash/system/tray/throbber_view.h"
25 #include "ash/system/tray/tray_constants.h" 24 #include "ash/system/tray/tray_constants.h"
26 #include "ash/system/tray/tray_popup_utils.h" 25 #include "ash/system/tray/tray_popup_utils.h"
27 #include "ash/system/tray/tri_view.h" 26 #include "ash/system/tray/tri_view.h"
27 #include "ash/wm_shell.h"
28 #include "base/bind.h" 28 #include "base/bind.h"
29 #include "base/bind_helpers.h" 29 #include "base/bind_helpers.h"
30 #include "base/logging.h" 30 #include "base/logging.h"
31 #include "base/strings/utf_string_conversions.h" 31 #include "base/strings/utf_string_conversions.h"
32 #include "base/values.h" 32 #include "base/values.h"
33 #include "chromeos/network/network_connection_handler.h" 33 #include "chromeos/network/network_connection_handler.h"
34 #include "chromeos/network/network_handler.h" 34 #include "chromeos/network/network_handler.h"
35 #include "chromeos/network/network_state.h" 35 #include "chromeos/network/network_state.h"
36 #include "chromeos/network/network_type_pattern.h" 36 #include "chromeos/network/network_type_pattern.h"
37 #include "third_party/cros_system_api/dbus/service_constants.h" 37 #include "third_party/cros_system_api/dbus/service_constants.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 } 431 }
432 } 432 }
433 433
434 // Add providers without any configured networks, in the order that the 434 // Add providers without any configured networks, in the order that the
435 // providers were returned by the extensions system. 435 // providers were returned by the extensions system.
436 for (const VPNProvider& provider : providers) 436 for (const VPNProvider& provider : providers)
437 AddProviderAndNetworks(provider, networks); 437 AddProviderAndNetworks(provider, networks);
438 } 438 }
439 439
440 } // namespace ash 440 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/network/tray_vpn.cc ('k') | ash/system/overview/overview_button_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698