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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/instant/instant_controller.h
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h
index d2510e49414c8cbba18a91452fad8fba4bea810c..72799c72dee892adb2c1410e5891619765b4ecda 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/instant/instant_controller.h
@@ -156,6 +156,9 @@ class InstantController : public InstantLoaderDelegate {
InstantLoader* loader,
const std::vector<InstantSuggestion>& suggestions) OVERRIDE;
virtual void CommitInstantLoader(InstantLoader* loader) OVERRIDE;
+ virtual void SetInstantPreviewHeight(InstantLoader* loader,
+ int height,
+ InstantSizeUnits units) OVERRIDE;
virtual void InstantLoaderPreviewLoaded(InstantLoader* loader) OVERRIDE;
virtual void InstantSupportDetermined(InstantLoader* loader,
bool supports_instant) OVERRIDE;
@@ -275,6 +278,13 @@ class InstantController : public InstantLoaderDelegate {
// up in autocomplete history matches.
GURL url_for_history_;
+ // Desired height for the Instant page. Used in extended mode to show Instant
+ // at the top of the window and other stuff beneath it.
+ int preview_height_;
+
+ // Units for |preview_height_|.
+ InstantSizeUnits preview_height_units_;
+
DISALLOW_COPY_AND_ASSIGN(InstantController);
};
« 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