Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: chrome/browser/instant/instant_controller.h

Issue 10915217: Hook up SetInstantPreviewHeight for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move height to ShowPreview. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // Returns the transition type of the last AutocompleteMatch passed to Update. 149 // Returns the transition type of the last AutocompleteMatch passed to Update.
150 content::PageTransition last_transition_type() const { 150 content::PageTransition last_transition_type() const {
151 return last_transition_type_; 151 return last_transition_type_;
152 } 152 }
153 153
154 // InstantLoaderDelegate: 154 // InstantLoaderDelegate:
155 virtual void SetSuggestions( 155 virtual void SetSuggestions(
156 InstantLoader* loader, 156 InstantLoader* loader,
157 const std::vector<InstantSuggestion>& suggestions) OVERRIDE; 157 const std::vector<InstantSuggestion>& suggestions) OVERRIDE;
158 virtual void CommitInstantLoader(InstantLoader* loader) OVERRIDE; 158 virtual void CommitInstantLoader(InstantLoader* loader) OVERRIDE;
159 virtual void SetInstantPreviewHeight(InstantLoader* loader,
160 int height,
161 InstantSizeUnits units) OVERRIDE;
159 virtual void InstantLoaderPreviewLoaded(InstantLoader* loader) OVERRIDE; 162 virtual void InstantLoaderPreviewLoaded(InstantLoader* loader) OVERRIDE;
160 virtual void InstantSupportDetermined(InstantLoader* loader, 163 virtual void InstantSupportDetermined(InstantLoader* loader,
161 bool supports_instant) OVERRIDE; 164 bool supports_instant) OVERRIDE;
162 virtual void SwappedTabContents(InstantLoader* loader) OVERRIDE; 165 virtual void SwappedTabContents(InstantLoader* loader) OVERRIDE;
163 virtual void InstantLoaderContentsFocused(InstantLoader* loader) OVERRIDE; 166 virtual void InstantLoaderContentsFocused(InstantLoader* loader) OVERRIDE;
164 167
165 #if defined(UNIT_TEST) 168 #if defined(UNIT_TEST)
166 // Accessors used only in tests. 169 // Accessors used only in tests.
167 bool is_showing() const { return is_showing_; } 170 bool is_showing() const { return is_showing_; }
168 InstantLoader* loader() const { return loader_.get(); } 171 InstantLoader* loader() const { return loader_.get(); }
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 // the map at all or has a value 0, it means that search engine supports the 271 // the map at all or has a value 0, it means that search engine supports the
269 // Instant API (or we assume it does, since we haven't determined it doesn't). 272 // Instant API (or we assume it does, since we haven't determined it doesn't).
270 std::map<std::string, int> blacklisted_urls_; 273 std::map<std::string, int> blacklisted_urls_;
271 274
272 // Search terms extraction (for autocomplete history matches) doesn't work 275 // Search terms extraction (for autocomplete history matches) doesn't work
273 // on Instant URLs. So, whenever the user commits an Instant search, we add 276 // on Instant URLs. So, whenever the user commits an Instant search, we add
274 // an equivalent non-Instant search URL to history, so that the search shows 277 // an equivalent non-Instant search URL to history, so that the search shows
275 // up in autocomplete history matches. 278 // up in autocomplete history matches.
276 GURL url_for_history_; 279 GURL url_for_history_;
277 280
281 // Desired height for the Instant page. Used in extended mode to show Instant
282 // at the top of the window and other stuff beneath it.
283 int preview_height_;
284
285 // Units for |preview_height_|.
286 InstantSizeUnits preview_height_units_;
287
278 DISALLOW_COPY_AND_ASSIGN(InstantController); 288 DISALLOW_COPY_AND_ASSIGN(InstantController);
279 }; 289 };
280 290
281 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ 291 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/instant/instant_controller.cc » ('j') | chrome/browser/ui/views/frame/contents_container.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698