Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: chrome/browser/instant/instant_test_utils.cc

Issue 11889003: Fixing ESC in instant-extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added issue number to TODO. Created 7 years, 10 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 | Annotate | Revision Log
OLDNEW
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/instant/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"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 } 136 }
137 137
138 bool InstantTestBase::CheckVisibilityIs(content::WebContents* contents, 138 bool InstantTestBase::CheckVisibilityIs(content::WebContents* contents,
139 bool expected) { 139 bool expected) {
140 bool actual = !expected; // Purposely start with a mis-match. 140 bool actual = !expected; // Purposely start with a mis-match.
141 // We can only use ASSERT_*() in a method that returns void, hence this 141 // We can only use ASSERT_*() in a method that returns void, hence this
142 // convoluted check. 142 // convoluted check.
143 return GetBoolFromJS(contents, "!document.webkitHidden", &actual) && 143 return GetBoolFromJS(contents, "!document.webkitHidden", &actual) &&
144 actual == expected; 144 actual == expected;
145 } 145 }
146
147 bool InstantTestBase::HasUserInputInProgress() {
148 return omnibox()->model()->user_input_in_progress_;
149 }
150
151 bool InstantTestBase::HasTemporaryText() {
152 return omnibox()->model()->has_temporary_text_;
153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698