| 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_INSTANT_INSTANT_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 
| 6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 
| 7 | 7 | 
| 8 #include <list> | 8 #include <list> | 
| 9 #include <map> | 9 #include <map> | 
| 10 #include <string> | 10 #include <string> | 
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 191   // happen through the InstantController interface. | 191   // happen through the InstantController interface. | 
| 192   InstantOverlayModel* model() { return &model_; } | 192   InstantOverlayModel* model() { return &model_; } | 
| 193 | 193 | 
| 194  private: | 194  private: | 
| 195   FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); | 195   FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); | 
| 196   FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL); | 196   FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL); | 
| 197   FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); | 197   FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); | 
| 198   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh); | 198   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh); | 
| 199   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); | 199   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); | 
| 200   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); | 200   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); | 
|  | 201   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RestrictedItemReadback); | 
| 201   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant); | 202   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant); | 
| 202   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 203   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 
| 203                            OmniboxTextUponFocusedCommittedSERP); | 204                            OmniboxTextUponFocusedCommittedSERP); | 
| 204   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 205   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, | 
| 205                            MiddleClickOnSuggestionOpensInNewTab); | 206                            MiddleClickOnSuggestionOpensInNewTab); | 
| 206   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded); | 207   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded); | 
| 207   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab); | 208   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab); | 
| 208   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab); | 209   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab); | 
| 209   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); | 210   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); | 
| 210   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); | 211   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); | 
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 447   // Used for Top Sites async retrieval. | 448   // Used for Top Sites async retrieval. | 
| 448   base::WeakPtrFactory<InstantController> weak_ptr_factory_; | 449   base::WeakPtrFactory<InstantController> weak_ptr_factory_; | 
| 449 | 450 | 
| 450   // Used to get notifications about Most Visted changes. | 451   // Used to get notifications about Most Visted changes. | 
| 451   content::NotificationRegistrar registrar_; | 452   content::NotificationRegistrar registrar_; | 
| 452 | 453 | 
| 453   DISALLOW_COPY_AND_ASSIGN(InstantController); | 454   DISALLOW_COPY_AND_ASSIGN(InstantController); | 
| 454 }; | 455 }; | 
| 455 | 456 | 
| 456 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 457 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 
| OLD | NEW | 
|---|