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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 311 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
312 OverlayDoesNotEchoSearchProviderNavsuggest); | 312 OverlayDoesNotEchoSearchProviderNavsuggest); |
313 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch); | 313 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch); |
314 #if !defined(HTML_INSTANT_EXTENDED_POPUP) | 314 #if !defined(HTML_INSTANT_EXTENDED_POPUP) |
315 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab); | 315 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab); |
316 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 316 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
317 SearchDoesntReuseInstantTabWithoutSupport); | 317 SearchDoesntReuseInstantTabWithoutSupport); |
318 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 318 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
319 TypedSearchURLDoesntReuseInstantTab); | 319 TypedSearchURLDoesntReuseInstantTab); |
320 #endif | 320 #endif |
| 321 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 322 DispatchMVChangeEventWhileNavigatingBackToNTP); |
321 | 323 |
322 Profile* profile() const; | 324 Profile* profile() const; |
323 | 325 |
324 // Overridden from InstantPage::Delegate: | 326 // Overridden from InstantPage::Delegate: |
325 // TODO(shishir): We assume that the WebContent's current RenderViewHost is | 327 // TODO(shishir): We assume that the WebContent's current RenderViewHost is |
326 // the RenderViewHost being created which is not always true. Fix this. | 328 // the RenderViewHost being created which is not always true. Fix this. |
327 virtual void InstantPageRenderViewCreated( | 329 virtual void InstantPageRenderViewCreated( |
328 const content::WebContents* contents) OVERRIDE; | 330 const content::WebContents* contents) OVERRIDE; |
329 virtual void InstantSupportDetermined( | 331 virtual void InstantSupportDetermined( |
330 const content::WebContents* contents, | 332 const content::WebContents* contents, |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
543 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. | 545 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. |
544 bool allow_overlay_to_show_search_suggestions_; | 546 bool allow_overlay_to_show_search_suggestions_; |
545 | 547 |
546 // List of events and their timestamps, useful in debugging Instant behaviour. | 548 // List of events and their timestamps, useful in debugging Instant behaviour. |
547 mutable std::list<std::pair<int64, std::string> > debug_events_; | 549 mutable std::list<std::pair<int64, std::string> > debug_events_; |
548 | 550 |
549 DISALLOW_COPY_AND_ASSIGN(InstantController); | 551 DISALLOW_COPY_AND_ASSIGN(InstantController); |
550 }; | 552 }; |
551 | 553 |
552 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 554 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
OLD | NEW |