chrome/browser/ui/search/instant_test_utils.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_test_utils.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_test_utils.h ('k') | chrome/browser/ui/search/instant_unload_handler.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_test_utils.h"	5 #include "chrome/browser/ui/search/instant_test_utils.h"

6	6

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

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

9 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

10 #include "chrome/browser/search_engines/template_url_service.h"	10 #include "chrome/browser/search_engines/template_url_service.h"

11 #include "chrome/browser/search_engines/template_url_service_factory.h"	11 #include "chrome/browser/search_engines/template_url_service_factory.h"

12 #include "chrome/browser/ui/omnibox/omnibox_view.h"	12 #include "chrome/browser/ui/omnibox/omnibox_view.h"

13 #include "chrome/common/chrome_notification_types.h"	13 #include "chrome/common/chrome_notification_types.h"

14 #include "chrome/common/chrome_switches.h"	14 #include "chrome/common/chrome_switches.h"

15 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

(...skipping 172 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
188 bool InstantTestBase::LoadImage(content::RenderViewHost* rvh,	188 bool InstantTestBase::LoadImage(content::RenderViewHost* rvh,

189 const std::string& image,	189 const std::string& image,

190 bool* loaded) {	190 bool* loaded) {

191 std::string js_chrome =	191 std::string js_chrome =

192 "var img = document.createElement('img');"	192 "var img = document.createElement('img');"

193 "img.onerror = function() { domAutomationController.send(false); };"	193 "img.onerror = function() { domAutomationController.send(false); };"

194 "img.onload = function() { domAutomationController.send(true); };"	194 "img.onload = function() { domAutomationController.send(true); };"

195 "img.src = '" + image + "';";	195 "img.src = '" + image + "';";

196 return content::ExecuteScriptAndExtractBool(rvh, js_chrome, loaded);	196 return content::ExecuteScriptAndExtractBool(rvh, js_chrome, loaded);

197 }	197 }

OLD	NEW