chrome/browser/ui/views/frame/browser_view.cc - Issue 12022002: Fixing activation states from the new launcher. Also adding a whole bunch of unit tests for the new…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 12022002: Fixing activation states from the new launcher. Also adding a whole bunch of unit tests for the new… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Forgotten to add file to repository Created 7 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

« chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index 6761807e731db87d91adccba1e69fbd848dbb837..5a6d18b5175d5ef36c1eb6f2fb2d56ad0126789e 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -823,6 +823,11 @@ bool BrowserView::IsAlwaysOnTop() const {

}

gfx::NativeWindow BrowserView::GetNativeWindow() {

+ // While the browser destruction is going on, the widget can already be gone,

+ // but utility functions like FindBrowserWithWindow will come here and crash.

+ // We short circuit therefore.

+ if (!GetWidget())

+ return NULL;

return GetWidget()->GetTopLevelWidget()->GetNativeWindow();

}