chrome/browser/search/instant_service.cc - Issue 13905008: Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear…

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

Issue 13905008: Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear… (Closed) Base URL: https://git.chromium.org/chromium/src.git@master

Patch Set: Respond to Dan's comments. Created 7 years, 8 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/resources/local_ntp/local_ntp.js ('K') | « chrome/browser/resources/local_omnibox_popup/local_omnibox_popup.js ('k') | chrome/browser/search/local_ntp_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search/instant_service.cc

diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc

index d0f0f313d60bec342bb7b5e1af92284dcc86cbfb..17b432369a8f0291b11466ab39d8a4ea00733c91 100644

--- a/chrome/browser/search/instant_service.cc

+++ b/chrome/browser/search/instant_service.cc

@@ -10,7 +10,6 @@

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

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

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

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

#include "chrome/browser/ui/webui/favicon_source.h"

#include "chrome/browser/ui/webui/ntp/thumbnail_source.h"

#include "chrome/browser/ui/webui/theme_source.h"

@@ -52,7 +51,6 @@ InstantService::InstantService(Profile* profile)

content::URLDataSource::Add(profile, new ThumbnailSource(profile));

content::URLDataSource::Add(profile, new FaviconSource(

profile, FaviconSource::FAVICON));

- content::URLDataSource::Add(profile, new LocalOmniboxPopupSource());

content::URLDataSource::Add(profile, new LocalNtpSource());

}