TabContentsWrapper -> TabContents, part 43.

chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 783 matching lines @@
 
   if (type == chrome::NOTIFICATION_BROWSER_OPENED) {
     // Store the new browser ID and continue waiting for a new tab within it
     // to stop loading.
     new_window_id_ = ExtensionTabUtil::GetWindowId(
         content::Source<Browser>(source).ptr());
   } else if (type == content::NOTIFICATION_LOAD_STOP) {
     // Only send the result if the loaded tab is in the new window.
     NavigationController* controller =
         content::Source<NavigationController>(source).ptr();
-    TabContents* tab = TabContents::GetOwningTabContentsForWebContents(
-        controller->GetWebContents());
+    TabContents* tab =
+        TabContents::FromWebContents(controller->GetWebContents());
     int window_id = tab ? tab->restore_tab_helper()->window_id().id() : -1;
     if (window_id == new_window_id_) {
       if (for_browser_command_) {
         AutomationMsg_WindowExecuteCommand::WriteReplyParams(
             reply_message_.get(), true);
       }
       automation_->Send(reply_message_.release());
       delete this;
       return;
     }
@@ skipping 295 matching lines @@
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_DOM_OPERATION_RESPONSE) {
     content::Details<DomOperationNotificationDetails> dom_op_details(details);
     if (dom_op_details->automation_id == automation_id_)
       OnDomOperationCompleted(dom_op_details->json);
   } else if (type == chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN) {
     OnModalDialogShown();
   } else if (type == chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED) {
     WebContents* web_contents = content::Source<WebContents>(source).ptr();
     if (web_contents) {
-      TabContents* tab_contents =
-          TabContents::GetOwningTabContentsForWebContents(web_contents);
+      TabContents* tab_contents = TabContents::FromWebContents(web_contents);
       if (tab_contents &&
           tab_contents->content_settings() &&
           tab_contents->content_settings()->IsContentBlocked(
               CONTENT_SETTINGS_TYPE_JAVASCRIPT)) {
         OnJavascriptBlocked();
       }
     }
   }
 }
 
@@ skipping 119 matching lines @@
 void TabLanguageDeterminedObserver::Observe(
     int type, const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED);
 
   if (!automation_) {
     delete this;
     return;
   }
 
-  TranslateTabHelper* helper = TabContents::GetOwningTabContentsForWebContents(
-      web_contents_)->translate_tab_helper();
+  TranslateTabHelper* helper =
+      TabContents::FromWebContents(web_contents_)->translate_tab_helper();
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   return_value->SetBoolean("page_translated",
                            helper->language_state().IsPageTranslated());
   return_value->SetBoolean(
       "can_translate_page", TranslatePrefs::CanTranslate(
           automation_->profile()->GetPrefs(),
           helper->language_state().original_language(),
           web_contents_->GetURL()));
   return_value->SetString("original_language",
                           helper->language_state().original_language());
@@ skipping 870 matching lines @@
         AutomationJSONReply(automation_,
                             reply_message_.release()).SendSuccess(NULL);
       }
       delete this;
       return;
     } else {
       // The app has launched only if the loaded tab is in the new window.
       NavigationController* controller =
           content::Source<NavigationController>(source).ptr();
       TabContents* tab =
-          TabContents::GetOwningTabContentsForWebContents(
-              controller->GetWebContents());
+          TabContents::FromWebContents(controller->GetWebContents());
       int window_id = tab ? tab->restore_tab_helper()->window_id().id() : -1;
       if (window_id == new_window_id_) {
         if (automation_) {
           AutomationJSONReply(automation_,
                               reply_message_.release()).SendSuccess(NULL);
         }
         delete this;
         return;
       }
     }
@@ skipping 805 matching lines @@
     }
   } else if (type == chrome::NOTIFICATION_BROWSER_OPENED) {
     // Store the new browser ID and continue waiting for a new tab within it
     // to stop loading.
     new_window_id_ = ExtensionTabUtil::GetWindowId(
         content::Source<Browser>(source).ptr());
   } else if (type == content::NOTIFICATION_LOAD_STOP) {
     // Only send the result if the loaded tab is in the new window.
     NavigationController* controller =
         content::Source<NavigationController>(source).ptr();
-    TabContents* tab = TabContents::GetOwningTabContentsForWebContents(
-        controller->GetWebContents());
+    TabContents* tab =
+        TabContents::FromWebContents(controller->GetWebContents());
     int window_id = tab ? tab->restore_tab_helper()->window_id().id() : -1;
     if (window_id == new_window_id_) {
       if (automation_) {
         AutomationJSONReply(automation_, reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
@@ skipping 24 matching lines @@
   }
 
   ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
   if (host->extension_id() == extension_id_ &&
       host->extension_host_type() == chrome::VIEW_TYPE_EXTENSION_POPUP) {
     AutomationJSONReply(automation_, reply_message_.release())
         .SendSuccess(NULL);
     delete this;
   }
 }