Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: trunk/src/ash/system/chromeos/network/network_state_list_detailed_view.h

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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/ash/system/chromeos/network/network_state_list_detailed_view.h
===================================================================
--- trunk/src/ash/system/chromeos/network/network_state_list_detailed_view.h (revision 282838)
+++ trunk/src/ash/system/chromeos/network/network_state_list_detailed_view.h (working copy)
@@ -10,12 +10,12 @@
#include <vector>
#include "ash/system/chromeos/network/network_detailed_view.h"
+#include "ash/system/chromeos/network/network_icon.h"
+#include "ash/system/chromeos/network/network_icon_animation_observer.h"
#include "ash/system/tray/view_click_listener.h"
#include "ash/system/user/login_status.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
-#include "ui/chromeos/network/network_icon.h"
-#include "ui/chromeos/network/network_icon_animation_observer.h"
#include "ui/views/controls/button/button.h"
namespace chromeos {
@@ -39,7 +39,7 @@
: public NetworkDetailedView,
public views::ButtonListener,
public ViewClickListener,
- public ui::network_icon::AnimationObserver,
+ public network_icon::AnimationObserver,
public base::SupportsWeakPtr<NetworkStateListDetailedView> {
public:
enum ListType {
@@ -60,7 +60,7 @@
virtual void NetworkServiceChanged(
const chromeos::NetworkState* network) OVERRIDE;
- // ui::network_icon::AnimationObserver overrides
+ // network_icon::AnimationObserver overrides
virtual void NetworkIconChanged() OVERRIDE;
protected:

Powered by Google App Engine
This is Rietveld 408576698