ash/common/system/chromeos/network/tray_vpn.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: cleanup test Created 4 years, 5 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/common/system/chromeos/network/tray_sms.cc ('k') | ash/common/system/chromeos/screen_security/screen_tray_item.h » ('j') | ash/common/system/tray/system_tray_unittest.cc » ('J')
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/session/session_state_delegate.h"	7 #include "ash/common/session/session_state_delegate.h"

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

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

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

10 #include "ash/common/system/tray/system_tray_delegate.h"	11 #include "ash/common/system/tray/system_tray_delegate.h"

11 #include "ash/common/system/tray/tray_constants.h"	12 #include "ash/common/system/tray/tray_constants.h"

12 #include "ash/common/system/tray/tray_item_more.h"	13 #include "ash/common/system/tray/tray_item_more.h"

13 #include "ash/common/system/tray/tray_popup_label_button.h"	14 #include "ash/common/system/tray/tray_popup_label_button.h"

14 #include "ash/common/wm_shell.h"	15 #include "ash/common/wm_shell.h"

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

16 #include "chromeos/network/network_state.h"	16 #include "chromeos/network/network_state.h"

17 #include "chromeos/network/network_state_handler.h"	17 #include "chromeos/network/network_state_handler.h"

18 #include "grit/ash_strings.h"	18 #include "grit/ash_strings.h"

19 #include "grit/ui_chromeos_strings.h"	19 #include "grit/ui_chromeos_strings.h"

20 #include "third_party/cros_system_api/dbus/service_constants.h"	20 #include "third_party/cros_system_api/dbus/service_constants.h"

21 #include "ui/base/l10n/l10n_util.h"	21 #include "ui/base/l10n/l10n_util.h"

22 #include "ui/chromeos/network/network_icon.h"	22 #include "ui/chromeos/network/network_icon.h"

23 #include "ui/chromeos/network/network_icon_animation.h"	23 #include "ui/chromeos/network/network_icon_animation.h"

24 #include "ui/chromeos/network/network_icon_animation_observer.h"	24 #include "ui/chromeos/network/network_icon_animation_observer.h"

25	25

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

168	168

169 void TrayVPN::NetworkStateChanged() {	169 void TrayVPN::NetworkStateChanged() {

170 if (default_)	170 if (default_)

171 default_->Update();	171 default_->Update();

172 if (detailed_)	172 if (detailed_)

173 detailed_->Update();	173 detailed_->Update();

174 }	174 }

175	175

176 } // namespace ash	176 } // namespace ash

OLD	NEW