Remove unused / unnecessary stuff from Instant.

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/instant/instant_loader_delegate.h"
+#include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/thumbnails/thumbnail_tab_helper.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/render_messages.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 10 matching lines @@
 
 class InstantLoaderUserData : public base::SupportsUserData::Data {
  public:
   explicit InstantLoaderUserData(InstantLoader* loader) : loader_(loader) {}
   virtual ~InstantLoaderUserData() {}
 
   InstantLoader* loader() const { return loader_; }
 
  private:
   InstantLoader* loader_;
-  DISALLOW_IMPLICIT_CONSTRUCTORS(InstantLoaderUserData);
+  DISALLOW_COPY_AND_ASSIGN(InstantLoaderUserData);
 };
 
 }
 
 // WebContentsDelegateImpl -----------------------------------------------------
 
 class InstantLoader::WebContentsDelegateImpl
     : public ConstrainedWindowTabHelperDelegate,
       public CoreTabHelperDelegate,
       public content::WebContentsDelegate,
@@ skipping 51 matching lines @@
                             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_IMPLICIT_CONSTRUCTORS(WebContentsDelegateImpl);
+  DISALLOW_COPY_AND_ASSIGN(WebContentsDelegateImpl);
 };
 
 InstantLoader::WebContentsDelegateImpl::WebContentsDelegateImpl(
     InstantLoader* loader)
     : content::WebContentsObserver(loader->preview_contents_->web_contents()),
       loader_(loader),
       is_pointer_down_from_activate_(false) {
 }
 
 bool InstantLoader::WebContentsDelegateImpl::ShouldFocusConstrainedWindow() {
@@ skipping 19 matching lines @@
 bool InstantLoader::WebContentsDelegateImpl::ShouldFocusPageAfterCrash() {
   return false;
 }
 
 void InstantLoader::WebContentsDelegateImpl::LostCapture() {
   CommitFromPointerReleaseIfNecessary();
 }
 
 void InstantLoader::WebContentsDelegateImpl::WebContentsFocused(
     content::WebContents* contents) {
-  loader_->loader_delegate_->InstantLoaderContentsFocused(loader_);
+  loader_->controller_->InstantLoaderContentsFocused(loader_);
 }
 
 bool InstantLoader::WebContentsDelegateImpl::CanDownload(
     content::RenderViewHost* render_view_host,
     int request_id,
     const std::string& request_method) {
   // Downloads are disabled.
   return false;
 }
 
@@ skipping 28 matching lines @@
 }
 
 void InstantLoader::WebContentsDelegateImpl::DidFinishLoad(
     int64 frame_id,
     const GURL& validated_url,
     bool is_main_frame,
     content::RenderViewHost* render_view_host) {
   if (is_main_frame) {
     if (!loader_->supports_instant_)
       Send(new ChromeViewMsg_DetermineIfPageSupportsInstant(routing_id()));
-    loader_->loader_delegate_->InstantLoaderPreviewLoaded(loader_);
+    loader_->controller_->InstantLoaderPreviewLoaded(loader_);
   }
 }
 
 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_ShowInstantPreview,
                         OnShowInstantPreview);
     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());
   DCHECK(loader_->preview_contents_->web_contents());
   content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
                                         GetController().GetActiveEntry();
   if (entry && page_id == entry->GetPageID()) {
     MaybeSetAndNotifyInstantSupportDetermined(true);
-    loader_->loader_delegate_->SetSuggestions(loader_, suggestions);
+    loader_->controller_->SetSuggestions(loader_, suggestions);
   }
 }
 
 void InstantLoader::WebContentsDelegateImpl::OnInstantSupportDetermined(
     int page_id,
     bool result) {
   DCHECK(loader_->preview_contents());
   DCHECK(loader_->preview_contents_->web_contents());
   content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
                                         GetController().GetActiveEntry();
   if (entry && page_id == entry->GetPageID())
     MaybeSetAndNotifyInstantSupportDetermined(result);
 }
 
 void InstantLoader::WebContentsDelegateImpl::OnShowInstantPreview(
     int page_id,
     InstantShownReason reason,
     int height,
     InstantSizeUnits units) {
   DCHECK(loader_->preview_contents());
   DCHECK(loader_->preview_contents_->web_contents());
   content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
                                         GetController().GetActiveEntry();
   if (entry && page_id == entry->GetPageID()) {
     MaybeSetAndNotifyInstantSupportDetermined(true);
-    loader_->loader_delegate_->ShowInstantPreview(loader_,
-                                                  reason, height, units);
+    loader_->controller_->ShowInstantPreview(loader_, reason, height, units);
   }
 }
 
 void InstantLoader::WebContentsDelegateImpl
     ::CommitFromPointerReleaseIfNecessary() {
   if (is_pointer_down_from_activate_) {
     is_pointer_down_from_activate_ = false;
-    loader_->loader_delegate_->CommitInstantLoader(loader_);
+    loader_->controller_->CommitInstantLoader(loader_);
   }
 }
 
 void InstantLoader::WebContentsDelegateImpl
     ::MaybeSetAndNotifyInstantSupportDetermined(bool supports_instant) {
   // If we already determined that the loader supports Instant, nothing to do.
   if (loader_->supports_instant_)
     return;
 
   // If the page doesn't support the Instant API, InstantController schedules
   // the loader for destruction. Stop sending the controller any more messages,
   // by severing the connection from the WebContents to us (its delegate).
   if (!supports_instant) {
     loader_->preview_contents_->web_contents()->SetDelegate(NULL);
     Observe(NULL);
   }
 
   loader_->supports_instant_ = supports_instant;
-  loader_->loader_delegate_->InstantSupportDetermined(loader_,
-                                                      supports_instant);
+  loader_->controller_->InstantSupportDetermined(loader_, supports_instant);
 }
 
 // InstantLoader ---------------------------------------------------------------
 
 // static
 InstantLoader* InstantLoader::FromWebContents(
     content::WebContents* web_contents) {
   InstantLoaderUserData* data = static_cast<InstantLoaderUserData*>(
       web_contents->GetUserData(&kUserDataKey));
   return data ? data->loader() : NULL;
 }
 
-InstantLoader::InstantLoader(InstantLoaderDelegate* delegate,
+InstantLoader::InstantLoader(InstantController* controller,
                              const std::string& instant_url,
                              const TabContents* tab_contents)
-    : loader_delegate_(delegate),
+    : controller_(controller),
       preview_contents_(
           TabContents::Factory::CreateTabContents(
               content::WebContents::CreateWithSessionStorage(
                   tab_contents->profile(), NULL, MSG_ROUTING_NONE,
                   tab_contents->web_contents(),
                   tab_contents->web_contents()->GetController().
                                           GetSessionStorageNamespaceMap()))),
       supports_instant_(false),
       instant_url_(instant_url) {
 }
@@ skipping 159 matching lines @@
 
 void InstantLoader::ReplacePreviewContents(content::WebContents* old_contents,
                                            content::WebContents* new_contents) {
   DCHECK_EQ(old_contents, preview_contents_->web_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(TabContents::FromWebContents(new_contents));
   SetupPreviewContents();
-  loader_delegate_->SwappedTabContents(this);
+  controller_->SwappedTabContents(this);
 }