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

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

Issue 351353004: chromeos: Move some network related UI in ui/chromeos/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-build 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: ash/system/chromeos/network/network_state_list_detailed_view.h
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.h b/ash/system/chromeos/network/network_state_list_detailed_view.h
index c8682358121fef95a33a38c48f3ccb2c01e09ed7..f135cb1d6065428f0fa8bfba6f9e111714b7bacf 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.h
@@ -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 @@ class NetworkStateListDetailedView
: public NetworkDetailedView,
public views::ButtonListener,
public ViewClickListener,
- public network_icon::AnimationObserver,
+ public ui::network_icon::AnimationObserver,
public base::SupportsWeakPtr<NetworkStateListDetailedView> {
public:
enum ListType {
@@ -60,7 +60,7 @@ class NetworkStateListDetailedView
virtual void NetworkServiceChanged(
const chromeos::NetworkState* network) OVERRIDE;
- // network_icon::AnimationObserver overrides
+ // ui::network_icon::AnimationObserver overrides
virtual void NetworkIconChanged() OVERRIDE;
protected:

Powered by Google App Engine
This is Rietveld 408576698