chrome/browser/ui/views/frame/browser_view.cc - Issue 10854173: Use a placeholder logo image/label in SearchViewController.

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 10854173: Use a placeholder logo image/label in SearchViewController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments; restore browser_context_ member. Created 8 years, 4 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 042f8ecd7b396a1d42cf33e7fb272ead27fe7442..395135a60cdbd8f3c81b454746513c7d22fe6de4 100644

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

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

@@ -1933,8 +1933,9 @@ void BrowserView::Init() {

views::View* omnibox_popup_view_parent = NULL;

// SearchViewController doesn't work on windows yet.

#if defined(USE_AURA)

- if (chrome::search::IsInstantExtendedAPIEnabled(browser_->profile())) {

- search_view_controller_.reset(new SearchViewController(contents_));

+ Profile* profile = browser_->profile();

+ if (chrome::search::IsInstantExtendedAPIEnabled(profile)) {

+ search_view_controller_.reset(new SearchViewController(profile, contents_));

omnibox_popup_view_parent =

search_view_controller_->omnibox_popup_view_parent();

}