| Index: chrome/browser/ui/search/instant_controller.cc
|
| diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc
|
| index 458f33106a15bc7db0812d9c0d26877d0d5988b5..20457259d6a51a6c31b110b6ee0f94a224215d9c 100644
|
| --- a/chrome/browser/ui/search/instant_controller.cc
|
| +++ b/chrome/browser/ui/search/instant_controller.cc
|
| @@ -16,7 +16,7 @@
|
| #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_page.h"
|
| +#include "chrome/browser/ui/search/instant_tab.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"
|
| @@ -31,7 +31,7 @@
|
|
|
| namespace {
|
|
|
| -bool IsContentsFrom(const InstantPage* page,
|
| +bool IsContentsFrom(const InstantTab* page,
|
| const content::WebContents* contents) {
|
| return page && (page->web_contents() == contents);
|
| }
|
| @@ -118,14 +118,14 @@ Profile* InstantController::profile() const {
|
| return browser_->profile();
|
| }
|
|
|
| -InstantPage* InstantController::instant_tab() const {
|
| +InstantTab* 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
|
| + // Handle INSTANT_SUPPORT_YES here because InstantTab is not hooked up to the
|
| + // active tab. Search model changed listener in InstantTab will handle other
|
| // cases.
|
| if (instant_support != INSTANT_SUPPORT_YES)
|
| return;
|
| @@ -148,7 +148,7 @@ void InstantController::InstantSupportDetermined(
|
| content::NotificationService::NoDetails());
|
| }
|
|
|
| -void InstantController::InstantPageAboutToNavigateMainFrame(
|
| +void InstantController::InstantTabAboutToNavigateMainFrame(
|
| const content::WebContents* contents,
|
| const GURL& url) {
|
| DCHECK(IsContentsFrom(instant_tab(), contents));
|
| @@ -162,7 +162,7 @@ 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 InstantPage(this));
|
| + instant_tab_.reset(new InstantTab(this));
|
| instant_tab_->Init(active_tab);
|
| UpdateInfoForInstantTab();
|
| }
|
|
|