Moves instant related tab contents messages into instant and out of

chrome/browser/instant/instant_loader.cc

 // Copyright (c) 2011 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 <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 119 matching lines @@
     default:
       NOTREACHED();
       break;
   }
 }
 
 // TabContentsDelegateImpl -----------------------------------------------------
 
 class InstantLoader::TabContentsDelegateImpl
     : public TabContentsDelegate,
-      public NotificationObserver {
+      public NotificationObserver,
+      public TabContentsObserver {
  public:
   explicit TabContentsDelegateImpl(InstantLoader* loader);
 
   // Invoked prior to loading a new URL.
   void PrepareForNewLoad();
 
   // Invoked when the preview paints. Invokes PreviewPainted on the loader.
   void PreviewPainted();
 
   bool is_mouse_down_from_activate() const {
@@ skipping 54 matching lines @@
   // instant result when the drag ends, so that during the drag the page won't
   // move around.
   virtual void DragEnded() OVERRIDE;
   virtual bool CanDownload(int request_id) OVERRIDE;
   virtual void HandleMouseUp() OVERRIDE;
   virtual void HandleMouseActivate() OVERRIDE;
   virtual bool OnGoToEntryOffset(int offset) OVERRIDE;
   virtual bool ShouldAddNavigationToHistory(
       const history::HistoryAddPageArgs& add_page_args,
       NavigationType::Type navigation_type) OVERRIDE;
-  virtual void OnSetSuggestions(
-      int32 page_id,
-      const std::vector<std::string>& suggestions,
-      InstantCompleteBehavior behavior) OVERRIDE;
-  virtual void OnInstantSupportDetermined(int32 page_id, bool result) OVERRIDE;
   virtual bool ShouldShowHungRendererDialog() OVERRIDE;
 
+  // TabContentsObserver:
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+
  private:
   typedef std::vector<scoped_refptr<history::HistoryAddPageArgs> >
       AddPageVector;
 
+  // Message from renderer indicating the page has suggestions.
+  void OnSetSuggestions(
+      int32 page_id,
+      const std::vector<std::string>& suggestions,
+      InstantCompleteBehavior behavior);
+
+  // Messages from the renderer when we've determined whether the page supports
+  // instant.
+  void OnInstantSupportDetermined(int32 page_id, bool result);
+
   void CommitFromMouseReleaseIfNecessary();
 
   InstantLoader* loader_;
 
   NotificationRegistrar registrar_;
 
   // If we are registered for paint notifications on a RenderWidgetHost this
   // will contain a pointer to it.
   RenderWidgetHost* registered_render_widget_host_;
 
@@ skipping 11 matching lines @@
   bool is_mouse_down_from_activate_;
 
   // True if the user typed in the search box before the page loaded.
   bool user_typed_before_load_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsDelegateImpl);
 };
 
 InstantLoader::TabContentsDelegateImpl::TabContentsDelegateImpl(
     InstantLoader* loader)
-    : loader_(loader),
+    : TabContentsObserver(loader->preview_contents()->tab_contents()),
+      loader_(loader),
       registered_render_widget_host_(NULL),
       waiting_for_new_page_(true),
       is_mouse_down_from_activate_(false),
       user_typed_before_load_(false) {
   DCHECK(loader->preview_contents());
   registrar_.Add(this, NotificationType::INTERSTITIAL_ATTACHED,
       Source<TabContents>(loader->preview_contents()->tab_contents()));
 }
 
 void InstantLoader::TabContentsDelegateImpl::PrepareForNewLoad() {
@@ skipping 248 matching lines @@
   if (waiting_for_new_page_ && navigation_type == NavigationType::NEW_PAGE)
     waiting_for_new_page_ = false;
 
   if (!waiting_for_new_page_) {
     add_page_vector_.push_back(
         scoped_refptr<history::HistoryAddPageArgs>(add_page_args.Clone()));
   }
   return false;
 }
 
+bool InstantLoader::TabContentsDelegateImpl::ShouldShowHungRendererDialog() {
+  // If we allow the hung renderer dialog to be shown it'll gain focus,
+  // stealing focus from the omnibox causing instant to be cancelled. Return
+  // false so that doesn't happen.
+  return false;
+}
+
+bool InstantLoader::TabContentsDelegateImpl::OnMessageReceived(
+    const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(TabContentsDelegateImpl, message)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_SetSuggestions, OnSetSuggestions)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_InstantSupportDetermined,
+                        OnInstantSupportDetermined)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
 void InstantLoader::TabContentsDelegateImpl::OnSetSuggestions(
     int32 page_id,
     const std::vector<std::string>& suggestions,
     InstantCompleteBehavior behavior) {
   TabContentsWrapper* source = loader_->preview_contents();
   if (!source->controller().GetActiveEntry() ||
       page_id != source->controller().GetActiveEntry()->page_id())
     return;
 
   if (suggestions.empty())
@@ skipping 15 matching lines @@
       NotificationType::INSTANT_SUPPORT_DETERMINED,
       NotificationService::AllSources(),
       details);
 
   if (result)
     loader_->PageFinishedLoading();
   else
     loader_->PageDoesntSupportInstant(user_typed_before_load_);
 }
 
-bool InstantLoader::TabContentsDelegateImpl::ShouldShowHungRendererDialog() {
-  // If we allow the hung renderer dialog to be shown it'll gain focus,
-  // stealing focus from the omnibox causing instant to be cancelled. Return
-  // false so that doesn't happen.
-  return false;
-}
-
 void InstantLoader::TabContentsDelegateImpl
     ::CommitFromMouseReleaseIfNecessary() {
   bool was_down = is_mouse_down_from_activate_;
   is_mouse_down_from_activate_ = false;
   if (was_down && loader_->ShouldCommitInstantOnMouseUp())
     loader_->CommitInstantLoader();
 }
 
 // InstantLoader ---------------------------------------------------------------
 
@@ skipping 382 matching lines @@
       Source<NavigationController>(&preview_contents_->controller()));
 #endif
 
   registrar_.Add(
       this,
       NotificationType::NAV_ENTRY_COMMITTED,
       Source<NavigationController>(&preview_contents_->controller()));
 
   preview_contents_->tab_contents()->ShowContents();
 }