summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-29 20:45:25 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-29 20:45:25 +0000
commite45fb318db9aae1dcecaecbd0a563a65d039bfa3 (patch)
tree8b955cc23e6e41e8a9bcd4d85376dc0d0cf121e3 /chrome/browser
parent198ab76f09f7b2a6d3809c059d3916b90c74f4f4 (diff)
downloadchromium_src-e45fb318db9aae1dcecaecbd0a563a65d039bfa3.zip
chromium_src-e45fb318db9aae1dcecaecbd0a563a65d039bfa3.tar.gz
chromium_src-e45fb318db9aae1dcecaecbd0a563a65d039bfa3.tar.bz2
Protect NetworkScreen::OnDialogCancelled() from view() == NULL
BUG=chromium-os:4294 (http://code.google.com/p/chromium-os/issues/detail?id=4294) TEST=unable to repro, likely an edge case Review URL: http://codereview.chromium.org/2809043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/login/network_screen.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index 73fc67b..f75b969 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -178,8 +178,10 @@ void NetworkScreen::OnDialogAccepted() {
}
void NetworkScreen::OnDialogCancelled() {
- view()->EnableContinue(false);
- view()->SetSelectedNetworkItem(0);
+ if (view()) {
+ view()->EnableContinue(false);
+ view()->SetSelectedNetworkItem(0);
+ }
}
///////////////////////////////////////////////////////////////////////////////