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

Unified Diff: chrome/browser/automation/testing_automation_provider_chromeos.cc

Issue 7969009: Removed chromeos::NetworkStateNotifier and redirected all related code to use (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/boot_times_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider_chromeos.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider_chromeos.cc (revision 102206)
+++ chrome/browser/automation/testing_automation_provider_chromeos.cc (working copy)
@@ -25,7 +25,6 @@
#include "chrome/browser/chromeos/login/screen_locker.h"
#include "chrome/browser/chromeos/login/webui_login_display.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/chromeos/network_state_notifier.h"
#include "chrome/browser/chromeos/options/take_photo_dialog.h"
#include "chrome/browser/chromeos/proxy_cros_settings_provider.h"
#include "chrome/browser/chromeos/system/timezone_settings.h"
@@ -39,6 +38,7 @@
#include "chrome/browser/ui/views/window.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
+#include "net/base/network_change_notifier.h"
#include "policy/policy_constants.h"
#include "views/widget/widget.h"
@@ -375,9 +375,8 @@
scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
- chromeos::NetworkStateNotifier* notifier =
- chromeos::NetworkStateNotifier::GetInstance();
- return_value->SetBoolean("offline_mode", !notifier->is_connected());
+ return_value->SetBoolean("offline_mode",
+ net::NetworkChangeNotifier::IsOffline());
// IP address.
return_value->SetString("ip_address", network_library->IPAddress());
« no previous file with comments | « no previous file | chrome/browser/chromeos/boot_times_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698