Move network_connect code to ui/chromeos/network (Take 2)

ui/chromeos/network/network_connect.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
+#ifndef UI_CHROMEOS_NETWORK_NETWORK_CONNECT_H
+#define UI_CHROMEOS_NETWORK_NETWORK_CONNECT_H
 
 #include <string>
 
-#include "ash/ash_export.h"
 #include "base/strings/string16.h"
+#include "ui/chromeos/ui_chromeos_export.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 class NetworkTypePattern;
 }
 
-namespace ash {
+namespace ui {
 
-class ASH_EXPORT NetworkConnect {
+class UI_CHROMEOS_EXPORT NetworkConnect {
  public:
   class Delegate {
    public:
     // Shows UI to configure or activate the network specified by |network_id|,
     // which may include showing Payment or Portal UI when appropriate.
     virtual void ShowNetworkConfigure(const std::string& network_id) = 0;
 
     // Shows the settings related to network. If |network_id| is not empty,
     // show the settings for that network.
     virtual void ShowNetworkSettings(const std::string& network_id) = 0;
@@ skipping 69 matching lines @@
   // or no matching network exists, shows the general internet settings page.
   virtual void ShowNetworkSettings(const std::string& service_path) = 0;
 
  protected:
   NetworkConnect();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkConnect);
 };
 
-}  // ash
+}  // ui
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
+#endif  // UI_CHROMEOS_NETWORK_NETWORK_CONNECT_H