Make WebContentsObserver::web_contents() public

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 "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
@@ skipping 24 matching lines @@
 #include "url/gurl.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/widget/widget.h"
 #endif
 
 namespace {
 
 bool IsContentsFrom(const InstantPage* page,
                     const content::WebContents* contents) {
-  return page && (page->contents() == contents);
+  return page && (page->web_contents() == contents);
 }
 
 // Adds a transient NavigationEntry to the supplied |contents|'s
 // NavigationController if the page's URL has not already been updated with the
 // supplied |search_terms|. Sets the |search_terms| on the transient entry for
 // search terms extraction to work correctly.
 void EnsureSearchTermsAreSet(content::WebContents* contents,
                              const base::string16& search_terms) {
   content::NavigationController* controller = &contents->GetController();
 
@@ skipping 24 matching lines @@
 }
 
 InstantController::~InstantController() {
 }
 
 bool InstantController::SubmitQuery(const base::string16& search_terms) {
   if (instant_tab_ && instant_tab_->supports_instant() &&
       search_mode_.is_origin_search()) {
     // Use |instant_tab_| to run the query if we're already on a search results
     // page. (NOTE: in particular, we do not send the query to NTPs.)
-    SearchTabHelper::FromWebContents(instant_tab_->contents())->Submit(
+    SearchTabHelper::FromWebContents(instant_tab_->web_contents())->Submit(
         search_terms);
-    instant_tab_->contents()->Focus();
-    EnsureSearchTermsAreSet(instant_tab_->contents(), search_terms);
+    instant_tab_->web_contents()->Focus();
+    EnsureSearchTermsAreSet(instant_tab_->web_contents(), search_terms);
     return true;
   }
   return false;
 }
 
 void InstantController::SearchModeChanged(const SearchMode& old_mode,
                                           const SearchMode& new_mode) {
   LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
       "SearchModeChanged: [origin:mode] %d:%d to %d:%d", old_mode.origin,
       old_mode.mode, new_mode.origin, new_mode.mode));
@@ skipping 67 matching lines @@
   DCHECK(IsContentsFrom(instant_tab(), contents));
 
   // 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_->contents()) {
+    if (!instant_tab_ || active_tab != instant_tab_->web_contents()) {
       instant_tab_.reset(new InstantTab(this, browser_->profile()));
       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());
 }