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 204 matching lines @@
                                 last_suggestion_.behavior);
 
     // We need to call Show() here because of this:
     // 1. User has typed a query (say Q). Instant overlay is showing results.
     // 2. User arrows-down to a URL entry or erases all omnibox text. Both of
     //    these cause the overlay to Hide().
     // 3. User arrows-up to Q or types Q again. The last text we processed is
     //    still Q, so we don't Update() the loader, but we do need to Show().
     if (loader_processed_last_update_ &&
         (mode_ == INSTANT || mode_ == EXTENDED))
-      Show();
+      Show(100, INSTANT_SIZE_PERCENT);
     return true;
   }
 
   last_verbatim_ = verbatim;
   loader_processed_last_update_ = false;
   last_suggestion_ = InstantSuggestion();
 
   if (mode_ != SILENT) {
     loader_->Update(query_text, verbatim);
 
@@ skipping 252 matching lines @@
       suggestion_lower.compare(0, user_text_lower.size(), user_text_lower))
     suggestion.text.clear();
   else
     suggestion.text.erase(0, last_user_text_.size());
 
   last_suggestion_ = suggestion;
   if (!last_verbatim_)
     delegate_->SetSuggestedText(suggestion.text, suggestion.behavior);
 
   if (mode_ != SUGGEST)
-    Show();
+    Show(100, INSTANT_SIZE_PERCENT);
 }
 
 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;
+
+  Show(height, units);
+}
+
 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(100, INSTANT_SIZE_PERCENT);
 }
 
 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();
@@ skipping 73 matching lines @@
   last_transition_type_ = content::PAGE_TRANSITION_LINK;
   last_match_was_search_ = false;
   last_omnibox_bounds_ = gfx::Rect();
   url_for_history_ = GURL();
   Hide();
   if (GetPreviewContents())
     AddPreviewUsageForHistogram(mode_, PREVIEW_DELETED);
   loader_.reset();
 }
 
-void InstantController::Show() {
+void InstantController::Show(int height, InstantSizeUnits units) {
+  // Call even if showing in case height changed.
+  delegate_->ShowInstant(height, units);
   if (!is_showing_) {
     is_showing_ = true;
-    delegate_->ShowInstant();
     AddPreviewUsageForHistogram(mode_, PREVIEW_SHOWED);
+
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_INSTANT_CONTROLLER_SHOWN,
+        content::Source<InstantController>(this),
+        content::NotificationService::NoDetails());
   }
 }
 
 void InstantController::SendBoundsToPage() {
   if (last_omnibox_bounds_ == omnibox_bounds_ || IsOutOfDate() ||
       !GetPreviewContents() || loader_->IsPointerDownFromActivate())
     return;
 
   last_omnibox_bounds_ = omnibox_bounds_;
   gfx::Rect preview_bounds = delegate_->GetInstantBounds();
@@ skipping 66 matching lines @@
       iter->second > kMaxInstantSupportFailures)
     return false;
 
   return true;
 }
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
          last_active_tab_ != delegate_->GetActiveTabContents();
 }