| 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 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 ReloadSearchAfterBackReloadsCorrectQuery); | 301 ReloadSearchAfterBackReloadsCorrectQuery); |
| 302 FRIEND_TEST_ALL_PREFIXES(InstantExtendedFirstTabTest, | 302 FRIEND_TEST_ALL_PREFIXES(InstantExtendedFirstTabTest, |
| 303 RedirectToLocalOnLoadFailure); | 303 RedirectToLocalOnLoadFailure); |
| 304 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch); | 304 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch); |
| 305 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, HomeButtonAffectsMargin); | 305 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, HomeButtonAffectsMargin); |
| 306 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab); | 306 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab); |
| 307 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 307 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 308 SearchDoesntReuseInstantTabWithoutSupport); | 308 SearchDoesntReuseInstantTabWithoutSupport); |
| 309 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 309 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 310 TypedSearchURLDoesntReuseInstantTab); | 310 TypedSearchURLDoesntReuseInstantTab); |
| 311 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 312 DispatchMVChangeEventWhileNavigatingBackToNTP); |
| 311 | 313 |
| 312 // Overridden from InstantPage::Delegate: | 314 // Overridden from InstantPage::Delegate: |
| 313 // TODO(shishir): We assume that the WebContent's current RenderViewHost is | 315 // TODO(shishir): We assume that the WebContent's current RenderViewHost is |
| 314 // the RenderViewHost being created which is not always true. Fix this. | 316 // the RenderViewHost being created which is not always true. Fix this. |
| 315 virtual void InstantPageRenderViewCreated( | 317 virtual void InstantPageRenderViewCreated( |
| 316 const content::WebContents* contents) OVERRIDE; | 318 const content::WebContents* contents) OVERRIDE; |
| 317 virtual void InstantSupportDetermined( | 319 virtual void InstantSupportDetermined( |
| 318 const content::WebContents* contents, | 320 const content::WebContents* contents, |
| 319 bool supports_instant) OVERRIDE; | 321 bool supports_instant) OVERRIDE; |
| 320 virtual void InstantPageRenderViewGone( | 322 virtual void InstantPageRenderViewGone( |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. | 539 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. |
| 538 bool allow_overlay_to_show_search_suggestions_; | 540 bool allow_overlay_to_show_search_suggestions_; |
| 539 | 541 |
| 540 // List of events and their timestamps, useful in debugging Instant behaviour. | 542 // List of events and their timestamps, useful in debugging Instant behaviour. |
| 541 mutable std::list<std::pair<int64, std::string> > debug_events_; | 543 mutable std::list<std::pair<int64, std::string> > debug_events_; |
| 542 | 544 |
| 543 DISALLOW_COPY_AND_ASSIGN(InstantController); | 545 DISALLOW_COPY_AND_ASSIGN(InstantController); |
| 544 }; | 546 }; |
| 545 | 547 |
| 546 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 548 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
| OLD | NEW |