ash/system/network/tray_vpn.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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:

OLD	NEW
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/common/system/chromeos/network/tray_vpn.h"	5 #include "ash/system/network/tray_vpn.h"

6	6

7 #include "ash/common/session/session_state_delegate.h"	7 #include "ash/common/session/session_state_delegate.h"

8 #include "ash/common/system/chromeos/network/network_icon.h"

9 #include "ash/common/system/chromeos/network/network_icon_animation.h"

10 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"

11 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"

12 #include "ash/common/system/chromeos/network/vpn_list.h"

13 #include "ash/common/system/tray/system_tray.h"

14 #include "ash/common/system/tray/system_tray_delegate.h"

15 #include "ash/common/system/tray/tray_constants.h"

16 #include "ash/common/system/tray/tray_item_more.h"

17 #include "ash/common/system/tray/tray_popup_item_style.h"

18 #include "ash/common/wm_shell.h"	8 #include "ash/common/wm_shell.h"

19 #include "ash/resources/vector_icons/vector_icons.h"	9 #include "ash/resources/vector_icons/vector_icons.h"

20 #include "ash/strings/grit/ash_strings.h"	10 #include "ash/strings/grit/ash_strings.h"

	11 #include "ash/system/network/network_icon.h"

	12 #include "ash/system/network/network_icon_animation.h"

	13 #include "ash/system/network/network_icon_animation_observer.h"

	14 #include "ash/system/network/network_state_list_detailed_view.h"

	15 #include "ash/system/network/vpn_list.h"

	16 #include "ash/system/tray/system_tray.h"

	17 #include "ash/system/tray/system_tray_delegate.h"

	18 #include "ash/system/tray/tray_constants.h"

	19 #include "ash/system/tray/tray_item_more.h"

	20 #include "ash/system/tray/tray_popup_item_style.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 Loading...
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

OLD	NEW

« no previous file with comments | « ash/system/network/tray_vpn.h ('k') | ash/system/network/vpn_list.h » ('j') | no next file with comments »