Chromium Code Reviews| 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 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ | 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ |
| 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ | 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 81 return browser_->window()->GetLocationBar()->GetLocationEntry(); | 81 return browser_->window()->GetLocationBar()->GetLocationEntry(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 const GURL& instant_url() const { return instant_url_; } | 84 const GURL& instant_url() const { return instant_url_; } |
| 85 | 85 |
| 86 net::TestServer& https_test_server() { return https_test_server_; } | 86 net::TestServer& https_test_server() { return https_test_server_; } |
| 87 | 87 |
| 88 void KillInstantRenderView(); | 88 void KillInstantRenderView(); |
| 89 | 89 |
| 90 void FocusOmnibox(); | 90 void FocusOmnibox(); |
| 91 void FocusOmniboxAndWaitForInstantSupport(); | 91 void FocusOmniboxAndWaitForInstantOverlaySupport(); |
|
samarth
2013/04/29 17:49:20
Can you please document this change in the change
dougw
2013/04/29 21:57:07
Done.
| |
| 92 void FocusOmniboxAndWaitForInstantExtendedSupport(); | 92 void FocusOmniboxAndWaitForInstantOverlayAndNTPSupport(); |
| 93 | 93 |
| 94 void SetOmniboxText(const std::string& text); | 94 void SetOmniboxText(const std::string& text); |
| 95 bool SetOmniboxTextAndWaitForOverlayToShow(const std::string& text); | 95 bool SetOmniboxTextAndWaitForOverlayToShow(const std::string& text); |
| 96 void SetOmniboxTextAndWaitForSuggestion(const std::string& text); | 96 void SetOmniboxTextAndWaitForSuggestion(const std::string& text); |
| 97 | 97 |
| 98 bool GetBoolFromJS(content::WebContents* contents, | 98 bool GetBoolFromJS(content::WebContents* contents, |
| 99 const std::string& script, | 99 const std::string& script, |
| 100 bool* result) WARN_UNUSED_RESULT; | 100 bool* result) WARN_UNUSED_RESULT; |
| 101 bool GetIntFromJS(content::WebContents* contents, | 101 bool GetIntFromJS(content::WebContents* contents, |
| 102 const std::string& script, | 102 const std::string& script, |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 128 | 128 |
| 129 Browser* browser_; | 129 Browser* browser_; |
| 130 | 130 |
| 131 // HTTPS Testing server, started on demand. | 131 // HTTPS Testing server, started on demand. |
| 132 net::TestServer https_test_server_; | 132 net::TestServer https_test_server_; |
| 133 | 133 |
| 134 DISALLOW_COPY_AND_ASSIGN(InstantTestBase); | 134 DISALLOW_COPY_AND_ASSIGN(InstantTestBase); |
| 135 }; | 135 }; |
| 136 | 136 |
| 137 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ | 137 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ |
| OLD | NEW |