Hook up SetInstantPreviewHeight for ChromeOS.

chrome/browser/instant/instant_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
@@ skipping 278 matching lines @@
 }
 
 TabContents* InstantController::GetPreviewContents() const {
   return loader_.get() ? loader_->preview_contents() : NULL;
 }
 
 void InstantController::Hide() {
   last_active_tab_ = NULL;
   if (is_showing_) {
     is_showing_ = false;
+    preview_height_ = 100;
+    preview_height_units_ = INSTANT_SIZE_PERCENT;
     delegate_->HideInstant();
   }
   if (GetPreviewContents() && !last_full_text_.empty()) {
     // Send a blank query to ask the preview to clear out old results.
     last_full_text_.clear();
     last_user_text_.clear();
     loader_->Update(last_full_text_, true);
   }
 }
 
@@ skipping 191 matching lines @@
 
 void InstantController::CommitInstantLoader(InstantLoader* loader) {
   DCHECK_EQ(loader_.get(), loader);
   DCHECK(is_showing_ && !IsOutOfDate()) << is_showing_;
   if (loader_ != loader || !is_showing_ || IsOutOfDate())
     return;
 
   CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
 }
 
+void InstantController::SetInstantPreviewHeight(InstantLoader* loader,
+                                                int height,
+                                                InstantSizeUnits units) {
+  DCHECK_EQ(loader_.get(), loader);
+  if (loader_ != loader || mode_ != EXTENDED)
+    return;
+
+  preview_height_ = height;
+  preview_height_units_ = units;
+  Show();
+}
+
 void InstantController::InstantLoaderPreviewLoaded(InstantLoader* loader) {
   DCHECK_EQ(loader_.get(), loader);
   AddPreviewUsageForHistogram(mode_, PREVIEW_LOADED);
 }
 
 void InstantController::InstantSupportDetermined(InstantLoader* loader,
                                                  bool supports_instant) {
   DCHECK_EQ(loader_.get(), loader);
   if (supports_instant) {
     blacklisted_urls_.erase(loader->instant_url());
@@ skipping 12 matching lines @@
   content::Details<const bool> details(&supports_instant);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
       content::NotificationService::AllSources(),
       details);
 }
 
 void InstantController::SwappedTabContents(InstantLoader* loader) {
   DCHECK_EQ(loader_.get(), loader);
   if (loader_ == loader && is_showing_)
-    delegate_->ShowInstant();
+    delegate_->ShowInstant(preview_height_, preview_height_units_);
 }
 
 void InstantController::InstantLoaderContentsFocused(InstantLoader* loader) {
   DCHECK_EQ(loader_.get(), loader);
   DCHECK(is_showing_ && !IsOutOfDate()) << is_showing_;
 #if defined(USE_AURA)
   // On aura the omnibox only receives a focus lost if we initiate the focus
   // change. This does that.
   if (is_showing_ && !IsOutOfDate())
     delegate_->InstantPreviewFocused();
 #endif
 }
 
 InstantController::InstantController(InstantControllerDelegate* delegate,
                                      Mode mode)
     : delegate_(delegate),
       mode_(mode),
       last_active_tab_(NULL),
       last_verbatim_(false),
       last_transition_type_(content::PAGE_TRANSITION_LINK),
       last_match_was_search_(false),
       is_showing_(false),
-      loader_processed_last_update_(false) {
+      loader_processed_last_update_(false),
+      preview_height_(100),
+      preview_height_units_(INSTANT_SIZE_PERCENT) {
 }
 
 void InstantController::ResetLoader(const std::string& instant_url,
                                     const TabContents* active_tab) {
   if (GetPreviewContents() && loader_->instant_url() != instant_url)
     DeleteLoader();
 
   if (!GetPreviewContents()) {
     DCHECK(!loader_.get());
     loader_.reset(new InstantLoader(this, instant_url, active_tab));
@@ skipping 53 matching lines @@
   url_for_history_ = GURL();
   Hide();
   if (GetPreviewContents())
     AddPreviewUsageForHistogram(mode_, PREVIEW_DELETED);
   loader_.reset();
 }
 
 void InstantController::Show() {
   if (!is_showing_) {
     is_showing_ = true;
-    delegate_->ShowInstant();
+    delegate_->ShowInstant(preview_height_, preview_height_units_);
     AddPreviewUsageForHistogram(mode_, PREVIEW_SHOWED);
   }
 }
 
 void InstantController::SendBoundsToPage() {
   if (last_omnibox_bounds_ == omnibox_bounds_ || IsOutOfDate() ||
       !GetPreviewContents() || loader_->IsPointerDownFromActivate())
     return;
 
   last_omnibox_bounds_ = omnibox_bounds_;
@@ skipping 67 matching lines @@
       iter->second > kMaxInstantSupportFailures)
     return false;
 
   return true;
 }
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
          last_active_tab_ != delegate_->GetActiveTabContents();
 }