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

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

Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayupdatemove
Patch Set: rebase Created 4 years, 6 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
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/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/hover_highlight_view.h"
11 #include "ash/common/system/tray/system_tray_delegate.h" 12 #include "ash/common/system/tray/system_tray_delegate.h"
12 #include "ash/common/system/tray/tray_constants.h" 13 #include "ash/common/system/tray/tray_constants.h"
14 #include "ash/common/system/tray/tray_popup_label_button.h"
13 #include "ash/common/wm_shell.h" 15 #include "ash/common/wm_shell.h"
14 #include "ash/metrics/user_metrics_recorder.h" 16 #include "ash/metrics/user_metrics_recorder.h"
15 #include "ash/shell.h" 17 #include "ash/shell.h"
16 #include "ash/system/chromeos/network/vpn_delegate.h" 18 #include "ash/system/chromeos/network/vpn_delegate.h"
17 #include "ash/system/tray/hover_highlight_view.h"
18 #include "ash/system/tray/tray_popup_label_button.h"
19 #include "base/bind.h" 19 #include "base/bind.h"
20 #include "base/bind_helpers.h" 20 #include "base/bind_helpers.h"
21 #include "base/logging.h" 21 #include "base/logging.h"
22 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
23 #include "base/values.h" 23 #include "base/values.h"
24 #include "chromeos/network/network_connection_handler.h" 24 #include "chromeos/network/network_connection_handler.h"
25 #include "chromeos/network/network_handler.h" 25 #include "chromeos/network/network_handler.h"
26 #include "chromeos/network/network_state.h" 26 #include "chromeos/network/network_state.h"
27 #include "chromeos/network/network_type_pattern.h" 27 #include "chromeos/network/network_type_pattern.h"
28 #include "grit/ash_strings.h" 28 #include "grit/ash_strings.h"
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 } 412 }
413 } 413 }
414 414
415 // Add providers without any configured networks, in the order that the 415 // Add providers without any configured networks, in the order that the
416 // providers were returned by the extensions system. 416 // providers were returned by the extensions system.
417 for (const VPNProvider& provider : providers) 417 for (const VPNProvider& provider : providers)
418 AddProviderAndNetworks(provider.key, provider.name, networks); 418 AddProviderAndNetworks(provider.key, provider.name, networks);
419 } 419 }
420 420
421 } // namespace ash 421 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/vpn_list_view.h ('k') | ash/system/chromeos/rotation/tray_rotation_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698