Eliminate c/b/chromeos/options/network_connect.cc

chrome/browser/chromeos/status/data_promo_notification.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/chromeos/status/data_promo_notification.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/system/chromeos/network/network_connect.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/mobile_config.h"
-#include "chrome/browser/chromeos/options/network_connect.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "grit/ash_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 
@@ skipping 133 matching lines @@
 }
 
 void DataPromoNotification::NotificationLinkClicked(
     ash::NetworkObserver::MessageType message_type,
     size_t link_index) {
   const NetworkState* cellular =
       NetworkHandler::Get()->network_state_handler()->
       FirstNetworkByType(flimflam::kTypeCellular);
   std::string service_path = cellular ? cellular->path() : "";
   if (message_type == ash::NetworkObserver::ERROR_OUT_OF_CREDITS) {
-    network_connect::ShowNetworkSettings(service_path);
+    ash::network_connect::ShowNetworkSettings(service_path);
     ash::Shell::GetInstance()->system_tray_notifier()->
         NotifyClearNetworkMessage(message_type);
   }
   if (message_type != ash::NetworkObserver::MESSAGE_DATA_PROMO)
     return;
 
   // If we have a deal info URL defined that means that there are
   // two links in the bubble. Let the user close it manually then giving the
   // ability to navigate to the second link.
   if (deal_info_url_.empty())
     CloseNotification();
 
   std::string deal_url_to_open;
   if (link_index == 0) {
     if (!deal_topup_url_.empty()) {
       deal_url_to_open = deal_topup_url_;
     } else {
-      network_connect::ShowNetworkSettings(service_path);
+      ash::network_connect::ShowNetworkSettings(service_path);
       return;
     }
   } else if (link_index == 1) {
     deal_url_to_open = deal_info_url_;
   }
 
   if (!deal_url_to_open.empty()) {
     Browser* browser = chrome::FindOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord(),
         chrome::HOST_DESKTOP_TYPE_ASH);
@@ skipping 89 matching lines @@
   if (carrier_deal_promo_pref != kNotificationCountPrefDefault)
     SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
 }
 
 void DataPromoNotification::CloseNotification() {
   ash::Shell::GetInstance()->system_tray_notifier()->NotifyClearNetworkMessage(
       ash::NetworkObserver::MESSAGE_DATA_PROMO);
 }
 
 }  // namespace chromeos