chrome/browser/ui/search/instant_loader.cc - Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/search/instant_loader.cc

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 years, 9 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 unified diff | Download patch

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

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/instant/instant_loader.h"	5 #include "chrome/browser/ui/search/instant_loader.h"

6	6

7 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	7 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

8 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"	8 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"

9 #include "chrome/browser/favicon/favicon_tab_helper.h"	9 #include "chrome/browser/favicon/favicon_tab_helper.h"

10 #include "chrome/browser/history/history_tab_helper.h"	10 #include "chrome/browser/history/history_tab_helper.h"

11 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"	11 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"

12 #include "chrome/browser/tab_contents/tab_util.h"	12 #include "chrome/browser/tab_contents/tab_util.h"

13 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"	13 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"

14 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"	14 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"

15 #include "chrome/browser/ui/search/search_tab_helper.h"	15 #include "chrome/browser/ui/search/search_tab_helper.h"

(...skipping 211 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
227	227

228 bool InstantLoader::OnGoToEntryOffset(int /* offset */) {	228 bool InstantLoader::OnGoToEntryOffset(int /* offset */) {

229 return false;	229 return false;

230 }	230 }

231	231

232 content::WebContents* InstantLoader::OpenURLFromTab(	232 content::WebContents* InstantLoader::OpenURLFromTab(

233 content::WebContents* source,	233 content::WebContents* source,

234 const content::OpenURLParams& params) {	234 const content::OpenURLParams& params) {

235 return delegate_->OpenURLFromTab(source, params);	235 return delegate_->OpenURLFromTab(source, params);

236 }	236 }

OLD	NEW