trunk/src/ash/system/chromeos/network/network_icon.cc - Issue 383373002: Revert 282837 because it broke non-chromeos builds.

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: trunk/src/ash/system/chromeos/network/network_icon.cc

Issue 383373002: Revert 282837 because it broke non-chromeos builds. (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 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 | Annotate | Revision Log

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

6	6

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

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

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

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

(...skipping 942 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
953 iter != networks.end(); ++iter) {	953 iter != networks.end(); ++iter) {

954 network_paths.insert((*iter)->path());	954 network_paths.insert((*iter)->path());

955 }	955 }

956 PurgeIconMap(ICON_TYPE_TRAY, network_paths);	956 PurgeIconMap(ICON_TYPE_TRAY, network_paths);

957 PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);	957 PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);

958 PurgeIconMap(ICON_TYPE_LIST, network_paths);	958 PurgeIconMap(ICON_TYPE_LIST, network_paths);

959 }	959 }

960	960

961 } // namespace network_icon	961 } // namespace network_icon

962 } // namespace ash	962 } // namespace ash

OLD	NEW