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

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

Issue 22796014: Eliminate c/b/chromeos/options/network_connect.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 4 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 fbe45658d2174c264b37b6ada3a4e35c7ab7af56..415ac5788cf8d2c5efea09a578e1cb60ba1b393d 100644
--- a/chrome/browser/chromeos/status/data_promo_notification.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification.cc
@@ -6,6 +6,7 @@
#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"
@@ -15,7 +16,6 @@
#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"
@@ -29,6 +29,7 @@
#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"
@@ -182,7 +183,7 @@ void DataPromoNotification::NotificationLinkClicked(
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);
}
@@ -200,7 +201,7 @@ void DataPromoNotification::NotificationLinkClicked(
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) {
« no previous file with comments | « chrome/browser/chromeos/options/wimax_config_view.cc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698