| 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 <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 content::PageTransition last_transition_type() const { | 196 content::PageTransition last_transition_type() const { |
| 197 return last_transition_type_; | 197 return last_transition_type_; |
| 198 } | 198 } |
| 199 | 199 |
| 200 // Non-const for Add/RemoveObserver only. Other model changes should only | 200 // Non-const for Add/RemoveObserver only. Other model changes should only |
| 201 // happen through the InstantController interface. | 201 // happen through the InstantController interface. |
| 202 InstantOverlayModel* model() { return &model_; } | 202 InstantOverlayModel* model() { return &model_; } |
| 203 | 203 |
| 204 private: | 204 private: |
| 205 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); | 205 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); |
| 206 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 207 SearchQueryNotDisplayedForNavsuggest); |
| 206 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL); | 208 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL); |
| 207 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); | 209 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); |
| 208 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh); | 210 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh); |
| 209 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); | 211 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); |
| 210 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); | 212 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); |
| 211 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RestrictedItemReadback); | 213 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RestrictedItemReadback); |
| 212 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant); | 214 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant); |
| 213 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 215 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 214 OmniboxTextUponFocusedCommittedSERP); | 216 OmniboxTextUponFocusedCommittedSERP); |
| 215 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 217 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 // Used for Top Sites async retrieval. | 476 // Used for Top Sites async retrieval. |
| 475 base::WeakPtrFactory<InstantController> weak_ptr_factory_; | 477 base::WeakPtrFactory<InstantController> weak_ptr_factory_; |
| 476 | 478 |
| 477 // Used to get notifications about Most Visted changes. | 479 // Used to get notifications about Most Visted changes. |
| 478 content::NotificationRegistrar registrar_; | 480 content::NotificationRegistrar registrar_; |
| 479 | 481 |
| 480 DISALLOW_COPY_AND_ASSIGN(InstantController); | 482 DISALLOW_COPY_AND_ASSIGN(InstantController); |
| 481 }; | 483 }; |
| 482 | 484 |
| 483 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 485 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
| OLD | NEW |