Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(525)

Issues Search
    My Issues | Starred     Open | Closed | All

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. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/ui/views/search_view_controller.h » ('j') | chrome/browser/ui/views/search_view_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 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();
}
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/ui/views/search_view_controller.h » ('j') | chrome/browser/ui/views/search_view_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698