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

Unified Diff: ash/common/system/chromeos/network/network_state_list_detailed_view.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_state_list_detailed_view.h
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.h b/ash/common/system/chromeos/network/network_state_list_detailed_view.h
index 3653ef4ac72fe53bc4151af0d9eb429bb385627d..d1fc8fe756d13be33da1e09e569908022bce603b 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.h
@@ -10,9 +10,9 @@
#include "ash/common/login_status.h"
#include "ash/common/system/chromeos/network/network_detailed_view.h"
+#include "ash/common/system/chromeos/network/network_list_delegate.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "ui/chromeos/network/network_list_delegate.h"
#include "ui/gfx/image/image.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/button/custom_button.h"
@@ -21,7 +21,7 @@ namespace chromeos {
class NetworkTypePattern;
}
-namespace ui {
+namespace ash {
class NetworkListViewBase;
}
@@ -40,7 +40,7 @@ namespace tray {
class NetworkStateListDetailedView
: public NetworkDetailedView,
- public ui::NetworkListDelegate,
+ public NetworkListDelegate,
public base::SupportsWeakPtr<NetworkStateListDetailedView> {
public:
enum ListType { LIST_TYPE_NETWORK, LIST_TYPE_VPN };
@@ -101,7 +101,7 @@ class NetworkStateListDetailedView
// Creates the view of an extra icon appearing next to the network name
// indicating that the network is controlled by an extension. If no extension
// is registered for this network, returns |nullptr|.
- views::View* CreateControlledByExtensionView(const ui::NetworkInfo& info);
+ views::View* CreateControlledByExtensionView(const NetworkInfo& info);
// Periodically request a network scan.
void CallRequestScan();
@@ -109,12 +109,12 @@ class NetworkStateListDetailedView
// Handle toggile mobile action
void ToggleMobile();
- // ui::NetworkListDelegate:
- views::View* CreateViewForNetwork(const ui::NetworkInfo& info) override;
+ // NetworkListDelegate:
+ views::View* CreateViewForNetwork(const NetworkInfo& info) override;
bool IsViewHovered(views::View* view) override;
chromeos::NetworkTypePattern GetNetworkTypePattern() const override;
void UpdateViewForNetwork(views::View* view,
- const ui::NetworkInfo& info) override;
+ const NetworkInfo& info) override;
views::Label* CreateInfoLabel() override;
void OnNetworkEntryClicked(views::View* sender) override;
void OnOtherWifiClicked() override;
@@ -159,7 +159,7 @@ class NetworkStateListDetailedView
gfx::Image controlled_by_extension_icon_;
- std::unique_ptr<ui::NetworkListViewBase> network_list_view_;
+ std::unique_ptr<NetworkListViewBase> network_list_view_;
DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView);
};

Powered by Google App Engine
This is Rietveld 408576698