Move NetworkStateNotifier and NetworkConnect from src/ui

chrome/browser/chromeos/net/network_connect_delegate_chromeos.h

Index: chrome/browser/chromeos/net/network_connect_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/network_connect_delegate_chromeos.h b/chrome/browser/chromeos/net/network_connect_delegate_chromeos.h
similarity index 52%
rename from chrome/browser/ui/ash/network_connect_delegate_chromeos.h
rename to chrome/browser/chromeos/net/network_connect_delegate_chromeos.h
index 994da57e22799c543b4382739584b79f4a34ec60..540a055e5c0f8c16d1920ff9bf526f5bec53f0b9 100644
--- a/chrome/browser/ui/ash/network_connect_delegate_chromeos.h
+++ b/chrome/browser/chromeos/net/network_connect_delegate_chromeos.h
@@ -2,17 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_ASH_NETWORK_CONNECT_DELEGATE_CHROMEOS_H_
-#define CHROME_BROWSER_UI_ASH_NETWORK_CONNECT_DELEGATE_CHROMEOS_H_
+#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_CONNECT_DELEGATE_CHROMEOS_H_
+#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_CONNECT_DELEGATE_CHROMEOS_H_
 
+#include <memory>
 #include <string>
 
 #include "base/macros.h"
-#include "ui/chromeos/network/network_connect.h"
+#include "chromeos/network/network_connect.h"
 
 namespace chromeos {
 
-class NetworkConnectDelegateChromeOS : public ui::NetworkConnect::Delegate {
+class NetworkStateNotifier;
+
+class NetworkConnectDelegateChromeOS
+    : public chromeos::NetworkConnect::Delegate {

[James Cook, 2016/10/20 00:11:43]

nit: chromeos:: not needed

[stevenjb, 2016/10/20 00:57:23]

Done.

  public:
   NetworkConnectDelegateChromeOS();
   ~NetworkConnectDelegateChromeOS() override;
@@ -22,11 +26,16 @@ class NetworkConnectDelegateChromeOS : public ui::NetworkConnect::Delegate {
   bool ShowEnrollNetwork(const std::string& network_id) override;
   void ShowMobileSimDialog() override;
   void ShowMobileSetupDialog(const std::string& service_path) override;
+  void ShowNetworkConnectError(const std::string& error_name,
+                               const std::string& network_id) override;
+  void ShowMobileActivationError(const std::string& network_id) override;
 
  private:
+  std::unique_ptr<NetworkStateNotifier> network_state_notifier_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkConnectDelegateChromeOS);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_ASH_NETWORK_CONNECT_DELEGATE_CHROMEOS_H_
+#endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_CONNECT_DELEGATE_CHROMEOS_H_