| Index: chrome/browser/ui/search/search_tab_helper.cc
|
| diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc
|
| index efccd6fca51dba311b5c76f5803bbf6f049e3037..2453d08533a78dcb92a4f7f15730d644de21f369 100644
|
| --- a/chrome/browser/ui/search/search_tab_helper.cc
|
| +++ b/chrome/browser/ui/search/search_tab_helper.cc
|
| @@ -48,23 +48,6 @@ SearchTabHelper::SearchTabHelper(
|
| SearchTabHelper::~SearchTabHelper() {
|
| }
|
|
|
| -content::WebContents* SearchTabHelper::GetNTPWebContents() {
|
| - if (!ntp_web_contents_.get()) {
|
| - ntp_web_contents_.reset(content::WebContents::Create(
|
| - model_.tab_contents()->profile(),
|
| - model_.tab_contents()->web_contents()->GetSiteInstance(),
|
| - MSG_ROUTING_NONE,
|
| - NULL,
|
| - NULL));
|
| - ntp_web_contents_->GetController().LoadURL(
|
| - GURL(chrome::kChromeUINewTabURL),
|
| - content::Referrer(),
|
| - content::PAGE_TRANSITION_START_PAGE,
|
| - std::string());
|
| - }
|
| - return ntp_web_contents_.get();
|
| -}
|
| -
|
| void SearchTabHelper::OmniboxEditModelChanged(OmniboxEditModel* edit_model) {
|
| if (!is_search_enabled_)
|
| return;
|
| @@ -92,7 +75,6 @@ void SearchTabHelper::NavigateToPendingEntry(
|
| return;
|
|
|
| UpdateModel(url);
|
| - FlushNTP(url);
|
| }
|
|
|
| void SearchTabHelper::Observe(
|
| @@ -103,7 +85,6 @@ void SearchTabHelper::Observe(
|
| content::LoadCommittedDetails* committed_details =
|
| content::Details<content::LoadCommittedDetails>(details).ptr();
|
| UpdateModel(committed_details->entry->GetURL());
|
| - FlushNTP(committed_details->entry->GetURL());
|
| }
|
|
|
| void SearchTabHelper::UpdateModel(const GURL& url) {
|
| @@ -115,12 +96,5 @@ void SearchTabHelper::UpdateModel(const GURL& url) {
|
| model_.SetMode(Mode(type, true));
|
| }
|
|
|
| -void SearchTabHelper::FlushNTP(const GURL& url) {
|
| - if (!IsNTP(url) &&
|
| - !google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec())) {
|
| - ntp_web_contents_.reset();
|
| - }
|
| -}
|
| -
|
| } // namespace search
|
| } // namespace chrome
|
|
|