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

Unified Diff: chrome/browser/ui/browser_instant_controller.cc

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/ui/browser_instant_controller.cc
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index 461179ed9bdea199a25f349fa92805618b747489..c7d4885496d5e2232046436c93ff1d1e16bb7020 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -77,11 +77,11 @@ bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition) {
////////////////////////////////////////////////////////////////////////////////
// BrowserInstantController, InstantControllerDelegate implementation:
-void BrowserInstantController::ShowInstant() {
+void BrowserInstantController::ShowInstant(int height, InstantSizeUnits units) {
// Call ShowInstant() first, before WasShown(), so that the preview is added
// to the window hierarchy before it's painted. http://crbug.com/145568
TabContents* preview = instant_->GetPreviewContents();
- browser_->window()->ShowInstant(preview);
+ browser_->window()->ShowInstant(preview, height, units);
// TODO(beng): Investigate if we can avoid this and instead rely on the
// visibility of the WebContentsView.

Powered by Google App Engine
This is Rietveld 408576698