chrome/browser/ui/views/frame/browser_view.cc - Issue 7492005: Fixes crash on startup with compact nav. A recent change meant it's

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 7492005: Fixes crash on startup with compact nav. A recent change meant it's (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 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:

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 656ac73160079d3937de6af278e5fadf59cf4406..f00222d8b804983a62ed3b701837e605ff521571 100644

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

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

@@ -1371,7 +1371,7 @@ BookmarkBarView* BrowserView::GetBookmarkBarView() const {

}

LocationBarView* BrowserView::GetLocationBarView() const {

- if (UseCompactNavigationBar()) {

+ if (UseCompactNavigationBar() && compact_location_bar_view_host_.get()) {

return compact_location_bar_view_host_->GetCompactLocationBarView()->

location_bar_view();

} else {

« no previous file with comments | « no previous file | no next file » | no next file with comments »