Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: chrome/browser/chromeos/status/data_promo_notification.cc

Issue 693493003: Revert "Move network_connect code to ui/chromeos/network" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/data_promo_notification.cc
diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc
index 0cf7b9cfaa21517d8720174fcf7db461491b2219..a69fb141ef7988dc49ba47105e7d40e5dac761ac 100644
--- a/chrome/browser/chromeos/status/data_promo_notification.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/chromeos/status/data_promo_notification.h"
+#include "ash/resources/grit/ash_resources.h"
+#include "ash/system/chromeos/network/network_connect.h"
#include "ash/system/system_notifier.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
@@ -25,12 +27,9 @@
#include "chromeos/network/network_event_log.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
-#include "grit/ui_chromeos_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/chromeos/network/network_connect.h"
-#include "ui/chromeos/network/network_state_notifier.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/notification.h"
#include "ui/views/view.h"
@@ -124,7 +123,7 @@ const chromeos::MobileConfig::CarrierDeal* GetCarrierDeal(
void NotificationClicked(const std::string& service_path,
const std::string& info_url) {
if (info_url.empty())
- ui::NetworkConnect::Get()->ShowNetworkSettings(service_path);
+ ash::NetworkConnect::Get()->ShowNetworkSettings(service_path);
chrome::ScopedTabbedBrowserDisplayer displayer(
ProfileManager::GetPrimaryUserProfile(),
@@ -217,7 +216,7 @@ void DataPromoNotification::ShowOptionalMobileDataPromoNotification() {
message_center::MessageCenter::Get()->AddNotification(
message_center::Notification::CreateSystemNotification(
kDataPromoNotificationId, base::string16() /* title */, message, icon,
- ui::NetworkStateNotifier::kNotifierNetwork,
+ ash::system_notifier::kNotifierNetwork,
base::Bind(&NotificationClicked, default_network->path(), info_url)));
check_for_promo_ = false;
« no previous file with comments | « chrome/browser/chromeos/options/wimax_config_view.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698