ash/system/chromeos/network/tray_network.cc - Issue 980943005: Add ash UI for third-party VPNs

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

Issue 980943005: Add ash UI for third-party VPNs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_2_407541_434711_remove_combined_name

Patch Set: Updated after latest round of UI reviews. Created 5 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

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/system/chromeos/network/tray_network.h"	5 #include "ash/system/chromeos/network/tray_network.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

8 #include "ash/metrics/user_metrics_recorder.h"	8 #include "ash/metrics/user_metrics_recorder.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"	10 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"

(...skipping 11 matching lines...) Expand all Loading...
22 #include "chromeos/network/network_state_handler.h"	22 #include "chromeos/network/network_state_handler.h"

23 #include "grit/ash_resources.h"	23 #include "grit/ash_resources.h"

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

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

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

27 #include "ui/accessibility/ax_view_state.h"	27 #include "ui/accessibility/ax_view_state.h"

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

29 #include "ui/base/resource/resource_bundle.h"	29 #include "ui/base/resource/resource_bundle.h"

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

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

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

32 #include "ui/views/controls/image_view.h"	33 #include "ui/views/controls/image_view.h"

33 #include "ui/views/controls/link.h"	34 #include "ui/views/controls/link.h"

34 #include "ui/views/controls/link_listener.h"	35 #include "ui/views/controls/link_listener.h"

35 #include "ui/views/layout/box_layout.h"	36 #include "ui/views/layout/box_layout.h"

36 #include "ui/views/widget/widget.h"	37 #include "ui/views/widget/widget.h"

37	38

38 using chromeos::NetworkHandler;	39 using chromeos::NetworkHandler;

39 using chromeos::NetworkState;	40 using chromeos::NetworkState;

40 using chromeos::NetworkStateHandler;	41 using chromeos::NetworkStateHandler;

41 using chromeos::NetworkTypePattern;	42 using chromeos::NetworkTypePattern;

(...skipping 290 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
332 void TrayNetwork::NetworkStateChanged() {	333 void TrayNetwork::NetworkStateChanged() {

333 if (tray_)	334 if (tray_)

334 tray_->UpdateNetworkStateHandlerIcon();	335 tray_->UpdateNetworkStateHandlerIcon();

335 if (default_)	336 if (default_)

336 default_->Update();	337 default_->Update();

337 if (detailed_)	338 if (detailed_)

338 detailed_->Update();	339 detailed_->Update();

339 }	340 }

340	341

341 } // namespace ash	342 } // namespace ash

OLD	NEW

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