chrome/browser/ui/browser_instant_controller.cc - Issue 535773002: Android: Remove more browser extensions code, including some that snuck back in.

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/browser_instant_controller.cc

Issue 535773002: Android: Remove more browser extensions code, including some that snuck back in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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/bookmarks/bookmark_utils.cc ('k') | chrome/browser/ui/media_utils.cc » ('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/ui/browser_instant_controller.h"	5 #include "chrome/browser/ui/browser_instant_controller.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "chrome/browser/extensions/extension_service.h"

9 #include "chrome/browser/extensions/extension_web_ui.h"

10 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/search/instant_service.h"	9 #include "chrome/browser/search/instant_service.h"

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

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

14 #include "chrome/browser/ui/browser.h"	12 #include "chrome/browser/ui/browser.h"

15 #include "chrome/browser/ui/browser_window.h"	13 #include "chrome/browser/ui/browser_window.h"

16 #include "chrome/browser/ui/location_bar/location_bar.h"	14 #include "chrome/browser/ui/location_bar/location_bar.h"

17 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"	15 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"

18 #include "chrome/browser/ui/omnibox/omnibox_view.h"	16 #include "chrome/browser/ui/omnibox/omnibox_view.h"

19 #include "chrome/browser/ui/search/instant_search_prerenderer.h"	17 #include "chrome/browser/ui/search/instant_search_prerenderer.h"

(...skipping 138 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 content::RenderProcessHost* rph = contents->GetRenderProcessHost();	156 content::RenderProcessHost* rph = contents->GetRenderProcessHost();

159 instant_service->SendSearchURLsToRenderer(rph);	157 instant_service->SendSearchURLsToRenderer(rph);

160	158

161 // Reload the contents to ensure that it gets assigned to a non-priviledged	159 // Reload the contents to ensure that it gets assigned to a non-priviledged

162 // renderer.	160 // renderer.

163 if (!instant_service->IsInstantProcess(rph->GetID()))	161 if (!instant_service->IsInstantProcess(rph->GetID()))

164 continue;	162 continue;

165 contents->GetController().Reload(false);	163 contents->GetController().Reload(false);

166 }	164 }

167 }	165 }

OLD	NEW