Move NetworkStateNotifier and NetworkConnect from src/ui

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/common/system/system_notifier.h"
 #include "base/command_line.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/net/network_state_notifier.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/device_state.h"
+#include "chromeos/network/network_connect.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 "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/extension_registry.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/chromeos/network/network_connect.h"
-#include "ui/chromeos/network/network_state_notifier.h"
 #include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 108 matching lines @@
     const std::string locale = g_browser_process->GetApplicationLocale();
     std::string deal_text = deal->GetLocalizedString(locale,
                                                      "notification_text");
     NET_LOG_DEBUG("Carrier Deal Found", deal_text);
     if (deal_text.empty())
       return NULL;
   }
   return deal;
 }
 
-void NotificationClicked(const std::string& service_path,
+void NotificationClicked(const std::string& network_id,
                          const std::string& info_url) {
   if (!info_url.empty()) {
     chrome::ScopedTabbedBrowserDisplayer displayer(
         ProfileManager::GetPrimaryUserProfile());
     chrome::ShowSingletonTab(displayer.browser(), GURL(info_url));
     if (info_url == kDataSaverExtensionUrl)
       content::RecordAction(base::UserMetricsAction("DataSaverPrompt_Clicked"));
   } else {
-    ui::NetworkConnect::Get()->ShowNetworkSettingsForPath(service_path);
+    SystemTrayClient::Get()->ShowNetworkSettings(network_id);
   }
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DataPromoNotification
 
 DataPromoNotification::DataPromoNotification()
     : notifications_shown_(false),
@@ skipping 76 matching lines @@
   if (default_network->network_technology() == shill::kNetworkTechnologyLte)
     icon_id = IDR_AURA_UBER_TRAY_NOTIFICATION_LTE;
   else
     icon_id = IDR_AURA_UBER_TRAY_NOTIFICATION_3G;
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(icon_id);
 
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kDataPromoNotificationId, base::string16() /* title */, message, icon,
-          ui::NetworkStateNotifier::kNotifierNetwork,
-          base::Bind(&NotificationClicked, default_network->path(), info_url)));
+          ash::system_notifier::kNotifierNetwork,
+          base::Bind(&NotificationClicked, default_network->guid(), info_url)));
 
   SetShow3gPromoNotification(false);
   if (carrier_deal_promo_pref != kNotificationCountPrefDefault)
     SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
 }
 
 bool DataPromoNotification::ShowDataSaverNotification() {
   if (!DataSaverSwitchEnabled())
     return false;
 
@@ skipping 15 matching lines @@
 
   base::string16 title = l10n_util::GetStringUTF16(IDS_3G_DATASAVER_TITLE);
   base::string16 message = l10n_util::GetStringUTF16(IDS_3G_DATASAVER_MESSAGE);
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_AURA_UBER_TRAY_NOTIFICATION_DATASAVER);
 
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kDataSaverNotificationId, title, message, icon,
-          ui::NetworkStateNotifier::kNotifierNetwork,
+          ash::system_notifier::kNotifierNetwork,
           base::Bind(&NotificationClicked, "", kDataSaverExtensionUrl)));
   content::RecordAction(base::UserMetricsAction("DataSaverPrompt_Shown"));
 
   if (DataSaverSwitchDemoMode()) {
     SetDataSaverPromptsShown(0);  // demo mode resets times shown counts.
     SetShow3gPromoNotification(true);
   } else {
     SetDataSaverPromptsShown(times_shown + 1);
   }
 
   return true;
 }
 
 }  // namespace chromeos