Merge InstantTag into InstantPage.

chrome/browser/ui/search/instant_controller.cc

 // Copyright 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/ui/search/instant_controller.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/location.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
-#include "chrome/browser/ui/search/instant_tab.h"
+#include "chrome/browser/ui/search/instant_page.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 // Macro used for logging debug events. |message| should be a std::string.
 #define LOG_INSTANT_DEBUG_EVENT(controller, message) \
@@ skipping 81 matching lines @@
 }
 
 void InstantController::ClearDebugEvents() {
   debug_events_.clear();
 }
 
 Profile* InstantController::profile() const {
   return browser_->profile();
 }
 
-InstantTab* InstantController::instant_tab() const {
+InstantPage* InstantController::instant_tab() const {
   return instant_tab_.get();
 }
 
 void InstantController::InstantSupportChanged(
     InstantSupportState instant_support) {
   // Handle INSTANT_SUPPORT_YES here because InstantPage is not hooked up to the
   // active tab. Search model changed listener in InstantPage will handle other
   // cases.
   if (instant_support != INSTANT_SUPPORT_YES)
     return;
@@ skipping 23 matching lines @@
 
   // The Instant tab navigated.  Send it the data it needs to display
   // properly.
   UpdateInfoForInstantTab();
 }
 
 void InstantController::ResetInstantTab() {
   if (!search_mode_.is_origin_default()) {
     content::WebContents* active_tab = browser_->GetActiveWebContents();
     if (!instant_tab_ || active_tab != instant_tab_->web_contents()) {
-      instant_tab_.reset(new InstantTab(this));
+      instant_tab_.reset(new InstantPage(this));
       instant_tab_->Init(active_tab);
       UpdateInfoForInstantTab();
     }
   } else {
     instant_tab_.reset();
   }
 }
 
 void InstantController::UpdateInfoForInstantTab() {
   if (instant_tab_) {
     // Update theme details.
     InstantService* instant_service = GetInstantService();
     if (instant_service) {
       instant_service->UpdateThemeInfo();
       instant_service->UpdateMostVisitedItemsInfo();
     }
   }
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }