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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 10832009: Additional checks/calls for cases when WebUI may be already gone but OOBE screen instance is not (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix tests Created 8 years, 5 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 | « chrome/browser/chromeos/login/update_screen.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 89b6da43b940f489d197a69a996ac73943462d9f..158fdf8290226cdf6ed1ce89696b21537670a77b 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -47,6 +47,8 @@ NetworkScreenHandler::NetworkScreenHandler()
}
NetworkScreenHandler::~NetworkScreenHandler() {
+ if (screen_)
+ screen_->OnActorDestroyed(this);
}
// NetworkScreenHandler, NetworkScreenActor implementation: --------------------
@@ -151,7 +153,8 @@ void NetworkScreenHandler::RegisterMessages() {
void NetworkScreenHandler::HandleOnExit(const ListValue* args) {
ClearErrors();
- screen_->OnContinuePressed();
+ if (screen_)
+ screen_->OnContinuePressed();
}
void NetworkScreenHandler::HandleOnLanguageChanged(const ListValue* args) {
« no previous file with comments | « chrome/browser/chromeos/login/update_screen.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698