Hook up SetInstantPreviewHeight for ChromeOS.

chrome/browser/instant/instant_loader.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_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/instant/instant_loader_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/common/instant_types.h"

[sreeram, 2012/09/18 22:24:24]

No need for this (already brought in by instant_loader_delegate.h).

[Jered, 2012/09/18 22:46:24]

Done.

 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 // WebContentsDelegateImpl -----------------------------------------------------
@@ skipping 44 matching lines @@
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   // Message from renderer indicating the page has suggestions.
   void OnSetSuggestions(int page_id,
                         const std::vector<InstantSuggestion>& suggestions);
 
   // Message from the renderer determining whether it supports the Instant API.
   void OnInstantSupportDetermined(int page_id, bool result);
 
+  // Message from the renderer requesting the preview be resized.
+  void OnSetInstantPreviewHeight(int page_id,
+                                 int height,
+                                 InstantSizeUnits units);
+
   void CommitFromPointerReleaseIfNecessary();
   void MaybeSetAndNotifyInstantSupportDetermined(bool supports_instant);
 
   InstantLoader* const loader_;
 
   // True if the mouse or a touch pointer is down from an activate.
   bool is_pointer_down_from_activate_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsDelegateImpl);
 };
@@ skipping 91 matching lines @@
   }
 }
 
 bool InstantLoader::WebContentsDelegateImpl::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebContentsDelegateImpl, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetSuggestions, OnSetSuggestions)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantSupportDetermined,
                         OnInstantSupportDetermined)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetInstantPreviewHeight,
+                        OnSetInstantPreviewHeight);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void InstantLoader::WebContentsDelegateImpl::OnSetSuggestions(
     int page_id,
     const std::vector<InstantSuggestion>& suggestions) {
   DCHECK(loader_->preview_contents() &&
          loader_->preview_contents_->web_contents());
@@ skipping 17 matching lines @@
   // TODO(sreeram): Remove this 'if' bandaid once bug 141875 is confirmed fixed.
   if (!loader_->preview_contents() ||
       !loader_->preview_contents_->web_contents())
     return;
   content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
                                         GetController().GetActiveEntry();
   if (entry && page_id == entry->GetPageID())
     MaybeSetAndNotifyInstantSupportDetermined(result);
 }
 
+void InstantLoader::WebContentsDelegateImpl::OnSetInstantPreviewHeight(
+    int page_id,
+    int height,
+    InstantSizeUnits units) {
+  DCHECK(loader_->preview_contents() &&
+         loader_->preview_contents_->web_contents());
+  // TODO(sreeram): Remove this 'if' bandaid once bug 141875 is confirmed fixed.
+  if (!loader_->preview_contents() ||
+      !loader_->preview_contents_->web_contents())
+    return;
+  content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
+                                        GetController().GetActiveEntry();
+  if (entry && page_id == entry->GetPageID()) {
+    MaybeSetAndNotifyInstantSupportDetermined(true);
+    loader_->loader_delegate_->SetInstantPreviewHeight(loader_, height, units);
+  }
+}
 
 void InstantLoader::WebContentsDelegateImpl
     ::CommitFromPointerReleaseIfNecessary() {
   if (is_pointer_down_from_activate_) {
     is_pointer_down_from_activate_ = false;
     loader_->loader_delegate_->CommitInstantLoader(loader_);
   }
 }
 
 void InstantLoader::WebContentsDelegateImpl
@@ skipping 154 matching lines @@
                                            TabContents* new_tc) {
   DCHECK(old_tc == preview_contents_);
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the TabContents.
   ignore_result(preview_contents_.release());
   preview_contents_.reset(new_tc);
   SetupPreviewContents();
   loader_delegate_->SwappedTabContents(this);
 }