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

Unified Diff: ash/common/system/chromeos/network/network_list.h

Issue 2435903002: Move tray code from ui/chromeos/network/ (Closed)
Patch Set: Rebase Created 4 years, 2 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/common/system/chromeos/network/network_list.h
diff --git a/ui/chromeos/network/network_list.h b/ash/common/system/chromeos/network/network_list.h
similarity index 81%
rename from ui/chromeos/network/network_list.h
rename to ash/common/system/chromeos/network/network_list.h
index d58f456efe9db6af51eef092c259169d6619d520..cf9dc3011450e756abef0ec5e8009e5e143d4343 100644
--- a/ui/chromeos/network/network_list.h
+++ b/ash/common/system/chromeos/network/network_list.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
-#define UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
#include <map>
#include <memory>
@@ -11,11 +11,10 @@
#include <string>
#include <vector>
+#include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
+#include "ash/common/system/chromeos/network/network_list_view_base.h"
#include "base/macros.h"
#include "chromeos/network/network_state_handler.h"
-#include "ui/chromeos/network/network_icon_animation_observer.h"
-#include "ui/chromeos/network/network_list_view_base.h"
-#include "ui/chromeos/ui_chromeos_export.h"
#include "ui/gfx/image/image_skia.h"
namespace views {
@@ -23,16 +22,15 @@ class Label;
class View;
}
-namespace ui {
+namespace ash {
struct NetworkInfo;
class NetworkListDelegate;
// A list of available networks of a given type. This class is used for all
// network types except VPNs. For VPNs, see the |VPNList| class.
-class UI_CHROMEOS_EXPORT NetworkListView
- : public NetworkListViewBase,
- public network_icon::AnimationObserver {
+class NetworkListView : public NetworkListViewBase,
+ public network_icon::AnimationObserver {
public:
explicit NetworkListView(NetworkListDelegate* delegate);
~NetworkListView() override;
@@ -77,6 +75,6 @@ class UI_CHROMEOS_EXPORT NetworkListView
DISALLOW_COPY_AND_ASSIGN(NetworkListView);
};
-} // namespace ui
+} // namespace ash
-#endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
« no previous file with comments | « ash/common/system/chromeos/network/network_info.cc ('k') | ash/common/system/chromeos/network/network_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698