ash/common/system/chromeos/network/tray_vpn.cc - Issue 2686703002: Remove TrayPopupLabelButton (a pre-MD class) and its assets.

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

Issue 2686703002: Remove TrayPopupLabelButton (a pre-MD class) and its assets. (Closed)

Patch Set: nit Created 3 years, 10 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:

« no previous file with comments | « ash/common/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/common/system/chromeos/network/vpn_list_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/common/system/chromeos/network/tray_vpn.h"

6	6

7 #include "ash/common/material_design/material_design_controller.h"	7 #include "ash/common/material_design/material_design_controller.h"

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

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

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

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

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

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

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

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

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

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

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

19 #include "ash/common/system/tray/tray_popup_label_button.h"

20 #include "ash/common/wm_shell.h"	19 #include "ash/common/wm_shell.h"

21 #include "ash/resources/vector_icons/vector_icons.h"	20 #include "ash/resources/vector_icons/vector_icons.h"

22 #include "chromeos/network/network_state.h"	21 #include "chromeos/network/network_state.h"

23 #include "chromeos/network/network_state_handler.h"	22 #include "chromeos/network/network_state_handler.h"

24 #include "grit/ash_strings.h"	23 #include "grit/ash_strings.h"

25 #include "third_party/cros_system_api/dbus/service_constants.h"	24 #include "third_party/cros_system_api/dbus/service_constants.h"

26 #include "ui/base/l10n/l10n_util.h"	25 #include "ui/base/l10n/l10n_util.h"

27 #include "ui/gfx/paint_vector_icon.h"	26 #include "ui/gfx/paint_vector_icon.h"

28	27

29 using chromeos::NetworkHandler;	28 using chromeos::NetworkHandler;

(...skipping 172 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
202 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}	201 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}

203	202

204 void TrayVPN::NetworkStateChanged() {	203 void TrayVPN::NetworkStateChanged() {

205 if (default_)	204 if (default_)

206 default_->Update();	205 default_->Update();

207 if (detailed_)	206 if (detailed_)

208 detailed_->Update();	207 detailed_->Update();

209 }	208 }

210	209

211 } // namespace ash	210 } // namespace ash

OLD	NEW