summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-15 18:01:10 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-15 18:01:10 +0000
commit8144d0cea4e142ff7d7a75c84240a4bb8a7fb3a4 (patch)
treed02991e00729c7467725a6f43abff458b48df579 /chrome/browser/views
parent0ae80b89e17ebe13f5f793cbae9942f8abe4852e (diff)
downloadchromium_src-8144d0cea4e142ff7d7a75c84240a4bb8a7fb3a4.zip
chromium_src-8144d0cea4e142ff7d7a75c84240a4bb8a7fb3a4.tar.gz
chromium_src-8144d0cea4e142ff7d7a75c84240a4bb8a7fb3a4.tar.bz2
Insert NULL check to fix dist crash
Review URL: http://codereview.chromium.org/7407 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/frame/browser_view2.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc
index f478cc6..6a33f1d 100644
--- a/chrome/browser/views/frame/browser_view2.cc
+++ b/chrome/browser/views/frame/browser_view2.cc
@@ -199,11 +199,10 @@ void BrowserView2::AddViewToDropList(ChromeViews::View* view) {
bool BrowserView2::ActivateAppModalDialog() const {
// If another browser is app modal, flash and activate the modal browser.
if (BrowserList::IsShowingAppModalDialog()) {
- if (browser_ != BrowserList::GetLastActive()) {
- CHECK(BrowserList::GetLastActive());
- CHECK(BrowserList::GetLastActive()->window());
- BrowserList::GetLastActive()->window()->FlashFrame();
- BrowserList::GetLastActive()->MoveToFront(true);
+ Browser* active_browser = BrowserList::GetLastActive();
+ if (active_browser && (browser_ != active_browser)) {
+ active_browser->window()->FlashFrame();
+ active_browser->MoveToFront(true);
}
AppModalDialogQueue::ActivateModalDialog();
return true;