| 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 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); | 94 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); |
| 95 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); | 95 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); |
| 96 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); | 96 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); |
| 97 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); | 97 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); |
| 98 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged); | 98 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged); |
| 99 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 99 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 100 AcceptingURLSearchDoesNotNavigate); | 100 AcceptingURLSearchDoesNotNavigate); |
| 101 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS); | 101 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS); |
| 102 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 102 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 103 ReloadSearchAfterBackReloadsCorrectQuery); | 103 ReloadSearchAfterBackReloadsCorrectQuery); |
| 104 FRIEND_TEST_ALL_PREFIXES(InstantExtendedFirstTabTest, | |
| 105 RedirectToLocalOnLoadFailure); | |
| 106 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch); | 104 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch); |
| 107 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, HomeButtonAffectsMargin); | 105 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, HomeButtonAffectsMargin); |
| 108 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab); | 106 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab); |
| 109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 107 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 110 SearchDoesntReuseInstantTabWithoutSupport); | 108 SearchDoesntReuseInstantTabWithoutSupport); |
| 111 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 112 TypedSearchURLDoesntReuseInstantTab); | 110 TypedSearchURLDoesntReuseInstantTab); |
| 113 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 111 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 114 DispatchMVChangeEventWhileNavigatingBackToNTP); | 112 DispatchMVChangeEventWhileNavigatingBackToNTP); |
| 115 | 113 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 146 // The search model mode for the active tab. | 144 // The search model mode for the active tab. |
| 147 SearchMode search_mode_; | 145 SearchMode search_mode_; |
| 148 | 146 |
| 149 // List of events and their timestamps, useful in debugging Instant behaviour. | 147 // List of events and their timestamps, useful in debugging Instant behaviour. |
| 150 mutable std::list<std::pair<int64, std::string> > debug_events_; | 148 mutable std::list<std::pair<int64, std::string> > debug_events_; |
| 151 | 149 |
| 152 DISALLOW_COPY_AND_ASSIGN(InstantController); | 150 DISALLOW_COPY_AND_ASSIGN(InstantController); |
| 153 }; | 151 }; |
| 154 | 152 |
| 155 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 153 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
| OLD | NEW |