chrome/browser/ui/search/instant_page.cc - Issue 18095002: Merge 208596 "Pipe a bit down to the InstantExtended new tab pag..."

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/search/instant_page.cc

Issue 18095002: Merge 208596 "Pipe a bit down to the InstantExtended new tab pag..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 years, 6 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

Index: chrome/browser/ui/search/instant_page.cc

===================================================================

--- chrome/browser/ui/search/instant_page.cc (revision 208940)

+++ chrome/browser/ui/search/instant_page.cc (working copy)

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/search/instant_page.h"

+#include "apps/app_launcher.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/search/search.h"

#include "chrome/browser/ui/search/instant_ipc_sender.h"

@@ -57,6 +58,10 @@

omnibox_font.GetFontSize());

}

+void InstantPage::InitializePromos() {

+ sender()->SetPromoInformation(apps::IsAppLauncherEnabled());

InstantPage::InstantPage(Delegate* delegate, const std::string& instant_url,

bool is_incognito)

: delegate_(delegate),

« no previous file with comments | « chrome/browser/ui/search/instant_page.h ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »