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

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/system/network/network_icon.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:

View unified diff | Download patch

« no previous file with comments | « ash/system/network/network_icon.h ('k') | ash/system/network/network_icon_animation.h » ('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/common/system/chromeos/network/network_icon.h"	5 #include "ash/system/network/network_icon.h"

6	6

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

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

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

10 #include "ash/resources/grit/ash_resources.h"	7 #include "ash/resources/grit/ash_resources.h"

11 #include "ash/resources/vector_icons/vector_icons.h"	8 #include "ash/resources/vector_icons/vector_icons.h"

12 #include "ash/strings/grit/ash_strings.h"	9 #include "ash/strings/grit/ash_strings.h"

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

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

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

13 #include "base/macros.h"	13 #include "base/macros.h"

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

15 #include "chromeos/network/device_state.h"	15 #include "chromeos/network/device_state.h"

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

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

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

19 #include "chromeos/network/portal_detector/network_portal_detector.h"	19 #include "chromeos/network/portal_detector/network_portal_detector.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 "third_party/skia/include/core/SkPaint.h"	21 #include "third_party/skia/include/core/SkPaint.h"

22 #include "third_party/skia/include/core/SkPath.h"	22 #include "third_party/skia/include/core/SkPath.h"

(...skipping 925 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
948 network_paths.insert((*iter)->path());	948 network_paths.insert((*iter)->path());

949 }	949 }

950 PurgeIconMap(ICON_TYPE_TRAY, network_paths);	950 PurgeIconMap(ICON_TYPE_TRAY, network_paths);

951 PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);	951 PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);

952 PurgeIconMap(ICON_TYPE_LIST, network_paths);	952 PurgeIconMap(ICON_TYPE_LIST, network_paths);

953 PurgeIconMap(ICON_TYPE_MENU_LIST, network_paths);	953 PurgeIconMap(ICON_TYPE_MENU_LIST, network_paths);

954 }	954 }

955	955

956 } // namespace network_icon	956 } // namespace network_icon

957 } // namespace ash	957 } // namespace ash

OLD	NEW