ash/system/chromeos/network/tray_network.cc - Issue 2030593002: Renames ash/wm/common into ash/common/wm

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

Issue 2030593002: Renames ash/wm/common into ash/common/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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/cast/tray_cast.cc ('k') | ash/system/chromeos/screen_security/screen_tray_item.cc » ('j') | no next file with comments »

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/common/wm/shelf/wm_shelf_util.h"

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

9 #include "ash/shelf/shelf_util.h"	10 #include "ash/shelf/shelf_util.h"

10 #include "ash/shell.h"	11 #include "ash/shell.h"

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

12 #include "ash/system/chromeos/network/tray_network_state_observer.h"	13 #include "ash/system/chromeos/network/tray_network_state_observer.h"

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

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

15 #include "ash/system/tray/system_tray_notifier.h"	16 #include "ash/system/tray/system_tray_notifier.h"

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

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

18 #include "ash/system/tray/tray_item_view.h"	19 #include "ash/system/tray/tray_item_view.h"

19 #include "ash/system/tray/tray_utils.h"	20 #include "ash/system/tray/tray_utils.h"

20 #include "ash/wm/common/shelf/wm_shelf_util.h"

21 #include "base/command_line.h"	21 #include "base/command_line.h"

22 #include "base/strings/utf_string_conversions.h"	22 #include "base/strings/utf_string_conversions.h"

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

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

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

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

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

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

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

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

(...skipping 305 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
336 void TrayNetwork::NetworkStateChanged() {	336 void TrayNetwork::NetworkStateChanged() {

337 if (tray_)	337 if (tray_)

338 tray_->UpdateNetworkStateHandlerIcon();	338 tray_->UpdateNetworkStateHandlerIcon();

339 if (default_)	339 if (default_)

340 default_->Update();	340 default_->Update();

341 if (detailed_)	341 if (detailed_)

342 detailed_->Update();	342 detailed_->Update();

343 }	343 }

344	344

345 } // namespace ash	345 } // namespace ash

OLD	NEW