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

Side by Side Diff: ash/system/network/tray_vpn.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_network.cc ('k') | ash/system/network/vpn_list_view.cc » ('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 (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 "ash/system/network/tray_vpn.h" 5 #include "ash/system/network/tray_vpn.h"
6 6
7 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/common/wm_shell.h"
9 #include "ash/resources/vector_icons/vector_icons.h" 7 #include "ash/resources/vector_icons/vector_icons.h"
8 #include "ash/session/session_state_delegate.h"
10 #include "ash/strings/grit/ash_strings.h" 9 #include "ash/strings/grit/ash_strings.h"
11 #include "ash/system/network/network_icon.h" 10 #include "ash/system/network/network_icon.h"
12 #include "ash/system/network/network_icon_animation.h" 11 #include "ash/system/network/network_icon_animation.h"
13 #include "ash/system/network/network_icon_animation_observer.h" 12 #include "ash/system/network/network_icon_animation_observer.h"
14 #include "ash/system/network/network_state_list_detailed_view.h" 13 #include "ash/system/network/network_state_list_detailed_view.h"
15 #include "ash/system/network/vpn_list.h" 14 #include "ash/system/network/vpn_list.h"
16 #include "ash/system/tray/system_tray.h" 15 #include "ash/system/tray/system_tray.h"
17 #include "ash/system/tray/system_tray_delegate.h" 16 #include "ash/system/tray/system_tray_delegate.h"
18 #include "ash/system/tray/tray_constants.h" 17 #include "ash/system/tray/tray_constants.h"
19 #include "ash/system/tray/tray_item_more.h" 18 #include "ash/system/tray/tray_item_more.h"
20 #include "ash/system/tray/tray_popup_item_style.h" 19 #include "ash/system/tray/tray_popup_item_style.h"
20 #include "ash/wm_shell.h"
21 #include "chromeos/network/network_state.h" 21 #include "chromeos/network/network_state.h"
22 #include "chromeos/network/network_state_handler.h" 22 #include "chromeos/network/network_state_handler.h"
23 #include "third_party/cros_system_api/dbus/service_constants.h" 23 #include "third_party/cros_system_api/dbus/service_constants.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/gfx/paint_vector_icon.h" 25 #include "ui/gfx/paint_vector_icon.h"
26 26
27 using chromeos::NetworkHandler; 27 using chromeos::NetworkHandler;
28 using chromeos::NetworkState; 28 using chromeos::NetworkState;
29 using chromeos::NetworkStateHandler; 29 using chromeos::NetworkStateHandler;
30 using chromeos::NetworkTypePattern; 30 using chromeos::NetworkTypePattern;
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {} 197 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
198 198
199 void TrayVPN::NetworkStateChanged() { 199 void TrayVPN::NetworkStateChanged() {
200 if (default_) 200 if (default_)
201 default_->Update(); 201 default_->Update();
202 if (detailed_) 202 if (detailed_)
203 detailed_->Update(); 203 detailed_->Update();
204 } 204 }
205 205
206 } // namespace ash 206 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/network/tray_network.cc ('k') | ash/system/network/vpn_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698