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

Unified Diff: chrome/browser/chromeos/cros/network_library.cc

Issue 6027012: Fix so that login errors are shown from login/oobe screens.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/cros/network_library.cc
===================================================================
--- chrome/browser/chromeos/cros/network_library.cc (revision 70931)
+++ chrome/browser/chromeos/cros/network_library.cc (working copy)
@@ -15,6 +15,7 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/browser_thread.h"
+#include "chrome/browser/chromeos/network_login_observer.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/common/time_format.h"
@@ -846,12 +847,16 @@
this);
data_plan_monitor_ = MonitorCellularDataPlan(&DataPlanUpdateHandler,
this);
+ network_login_observer_ = new NetworkLoginObserver(this);
} else {
InitTestData();
}
}
~NetworkLibraryImpl() {
+ if (network_login_observer_)
+ delete network_login_observer_;
+ network_login_observer_ = NULL;
network_manager_observers_.Clear();
if (network_manager_monitor_)
DisconnectPropertyChangeMonitor(network_manager_monitor_);
@@ -1860,6 +1865,9 @@
// For monitoring data plan changes to the connected cellular network.
DataPlanUpdateMonitor data_plan_monitor_;
+ // Network login observer.
+ NetworkLoginObserver* network_login_observer_;
stevenjb 2011/01/11 20:53:52 Maybe use scoped_ptr<NetworkLoginObserver>?
Charlie Lee 2011/01/11 22:52:06 Done.
+
// The ethernet network.
EthernetNetwork* ethernet_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/background_view.h » ('j') | chrome/browser/chromeos/network_login_observer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698