| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 150 |
| 151 // Returns the transition type of the last AutocompleteMatch passed to Update. | 151 // Returns the transition type of the last AutocompleteMatch passed to Update. |
| 152 content::PageTransition last_transition_type() const { | 152 content::PageTransition last_transition_type() const { |
| 153 return last_transition_type_; | 153 return last_transition_type_; |
| 154 } | 154 } |
| 155 | 155 |
| 156 // InstantLoaderDelegate: | 156 // InstantLoaderDelegate: |
| 157 virtual void SetSuggestions( | 157 virtual void SetSuggestions( |
| 158 InstantLoader* loader, | 158 InstantLoader* loader, |
| 159 const std::vector<InstantSuggestion>& suggestions) OVERRIDE; | 159 const std::vector<InstantSuggestion>& suggestions) OVERRIDE; |
| 160 virtual void SetHasCustomLogo(InstantLoader* loader, bool has_logo) OVERRIDE; |
| 160 virtual void CommitInstantLoader(InstantLoader* loader) OVERRIDE; | 161 virtual void CommitInstantLoader(InstantLoader* loader) OVERRIDE; |
| 161 virtual void SetInstantPreviewHeight(InstantLoader* loader, | 162 virtual void SetInstantPreviewHeight(InstantLoader* loader, |
| 162 int height, | 163 int height, |
| 163 InstantSizeUnits units) OVERRIDE; | 164 InstantSizeUnits units) OVERRIDE; |
| 164 virtual void InstantLoaderPreviewLoaded(InstantLoader* loader) OVERRIDE; | 165 virtual void InstantLoaderPreviewLoaded(InstantLoader* loader) OVERRIDE; |
| 165 virtual void InstantSupportDetermined(InstantLoader* loader, | 166 virtual void InstantSupportDetermined(InstantLoader* loader, |
| 166 bool supports_instant) OVERRIDE; | 167 bool supports_instant) OVERRIDE; |
| 167 virtual void SwappedTabContents(InstantLoader* loader) OVERRIDE; | 168 virtual void SwappedTabContents(InstantLoader* loader) OVERRIDE; |
| 168 virtual void InstantLoaderContentsFocused(InstantLoader* loader) OVERRIDE; | 169 virtual void InstantLoaderContentsFocused(InstantLoader* loader) OVERRIDE; |
| 169 | 170 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 // Search terms extraction (for autocomplete history matches) doesn't work | 290 // Search terms extraction (for autocomplete history matches) doesn't work |
| 290 // on Instant URLs. So, whenever the user commits an Instant search, we add | 291 // on Instant URLs. So, whenever the user commits an Instant search, we add |
| 291 // an equivalent non-Instant search URL to history, so that the search shows | 292 // an equivalent non-Instant search URL to history, so that the search shows |
| 292 // up in autocomplete history matches. | 293 // up in autocomplete history matches. |
| 293 GURL url_for_history_; | 294 GURL url_for_history_; |
| 294 | 295 |
| 295 DISALLOW_IMPLICIT_CONSTRUCTORS(InstantController); | 296 DISALLOW_IMPLICIT_CONSTRUCTORS(InstantController); |
| 296 }; | 297 }; |
| 297 | 298 |
| 298 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 299 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ |
| OLD | NEW |