Move NetworkStateNotifier and NetworkConnect from src/ui

chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
 #include "chrome/browser/chromeos/ui/mobile_config_ui.h"
 #include "chrome/browser/chromeos/ui_proxy_config_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
+#include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/onc/onc_constants.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/api/vpn_provider/vpn_service.h"
 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/webui/web_ui_util.h"
-#include "ui/chromeos/network/network_connect.h"
 
 namespace chromeos {
 namespace options {
 
 namespace {
 
 const char kAllowOnlyPolicyNetworksToConnect[] =
     "allowOnlyPolicyNetworksToConnect";
 
 // Keys for the initial "localized" dictionary values.
@@ skipping 91 matching lines @@
     const base::ListValue* args) {
   if (!web_ui())
     return;
   std::string guid;
   if (args->GetSize() != 1 || !args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
   std::string service_path = ServicePathFromGuid(guid);
   if (!service_path.empty())
-    ui::NetworkConnect::Get()->ShowMobileSetup(service_path);
+    NetworkConnect::Get()->ShowMobileSetup(service_path);
 }
 
 void InternetOptionsHandler::SimOperationCallback(const base::ListValue* args) {
   std::string operation;
   if (args->GetSize() != 1 || !args->GetString(0, &operation)) {
     NOTREACHED();
     return;
   }
   if (operation == kTagSimOpConfigure) {
     mobile_config_ui::DisplayConfigDialog();
@@ skipping 98 matching lines @@
   if (!force_show && !network->connectable() &&
       enrollment::CreateDialog(service_path, GetNativeWindow())) {
     return;
   }
 
   NetworkConfigView::ShowInParent(network->guid(), GetNativeWindow());
 }
 
 }  // namespace options
 }  // namespace chromeos