TabContentsWrapper -> TabContents, part 6.

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 42 matching lines @@
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/browser/translate/page_translated_details.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/login/login_prompt.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/view_type.h"
@@ skipping 300 matching lines @@
 
 TabStripNotificationObserver::~TabStripNotificationObserver() {
 }
 
 void TabStripNotificationObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == notification_) {
     if (type == chrome::NOTIFICATION_TAB_PARENTED) {
-      ObserveTab(&(content::Source<TabContentsWrapper>(source).ptr()->
+      ObserveTab(&(content::Source<TabContents>(source).ptr()->
                      web_contents()->GetController()));
     } else if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
       ObserveTab(&(content::Source<content::WebContents>(source).ptr()->
                      GetController()));
     } else {
       ObserveTab(content::Source<NavigationController>(source).ptr());
     }
     delete this;
   } else {
     NOTREACHED();
@@ skipping 69 matching lines @@
       tab_strip_model_(browser->tab_strip_model()),
       target_tab_count_(target_tab_count) {
   tab_strip_model_->AddObserver(this);
   CheckTabCount();
 }
 
 TabCountChangeObserver::~TabCountChangeObserver() {
   tab_strip_model_->RemoveObserver(this);
 }
 
-void TabCountChangeObserver::TabInsertedAt(TabContentsWrapper* contents,
+void TabCountChangeObserver::TabInsertedAt(TabContents* contents,
                                            int index,
                                            bool foreground) {
   CheckTabCount();
 }
 
-void TabCountChangeObserver::TabDetachedAt(TabContentsWrapper* contents,
+void TabCountChangeObserver::TabDetachedAt(TabContents* contents,
                                            int index) {
   CheckTabCount();
 }
 
 void TabCountChangeObserver::TabStripModelDeleted() {
   if (automation_) {
     AutomationMsg_WaitForTabCountToBecome::WriteReplyParams(
         reply_message_.get(), false);
     automation_->Send(reply_message_.release());
   }
@@ skipping 303 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();
-    TabContentsWrapper* tab = TabContentsWrapper::GetCurrentWrapperForContents(
+    TabContents* tab = TabContents::GetOwningTabContentsForWebContents(

[jam, 2012/06/07 21:39:20]

nit: i do wonder if this should just be
TabContents::FromWebContents(web_contents)?

         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 148 matching lines @@
     case IDC_CLOSE_TAB: {
       TabClosedNotificationObserver* observer =
           new TabClosedNotificationObserver(automation, true, reply_message);
       observer->set_for_browser_command(true);
       break;
     }
     case IDC_BACK:
     case IDC_FORWARD:
     case IDC_RELOAD: {
       new NavigationNotificationObserver(
-          &browser->GetSelectedWebContents()->GetController(),
+          &browser->GetActiveWebContents()->GetController(),
           automation, reply_message, 1, false, false);
       break;
     }
     default: {
       ExecuteBrowserCommandObserver* observer =
           new ExecuteBrowserCommandObserver(automation, reply_message);
       if (!observer->Register(command)) {
         delete observer;
         result = false;
       }
@@ skipping 127 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) {
-      TabContentsWrapper* wrapper =
-          TabContentsWrapper::GetCurrentWrapperForContents(web_contents);
-      if (wrapper &&
-          wrapper->content_settings() &&
-          wrapper->content_settings()->IsContentBlocked(
+      TabContents* tab_contents =
+          TabContents::GetOwningTabContentsForWebContents(web_contents);
+      if (tab_contents &&
+          tab_contents->content_settings() &&
+          tab_contents->content_settings()->IsContentBlocked(
               CONTENT_SETTINGS_TYPE_JAVASCRIPT)) {
         OnJavascriptBlocked();
       }
     }
   }
 }
 
 DomOperationMessageSender::DomOperationMessageSender(
     AutomationProvider* automation,
     IPC::Message* reply_message,
@@ skipping 116 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 = TabContentsWrapper::GetCurrentWrapperForContents(
+  TranslateTabHelper* helper = TabContents::GetOwningTabContentsForWebContents(
       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",
@@ skipping 23 matching lines @@
                         translate_bar_->GetOriginalLanguageCode());
     return_value->Set("translate_bar", bar_info);
   }
   AutomationJSONReply(automation_, reply_message_.release())
       .SendSuccess(return_value.get());
   delete this;
 }
 
 InfoBarCountObserver::InfoBarCountObserver(AutomationProvider* automation,
                                            IPC::Message* reply_message,
-                                           TabContentsWrapper* tab_contents,
+                                           TabContents* tab_contents,
                                            size_t target_count)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       tab_contents_(tab_contents),
       target_count_(target_count) {
   content::Source<InfoBarTabHelper> source(tab_contents->infobar_tab_helper());
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
                  source);
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                  source);
@@ skipping 484 matching lines @@
                           reply_message_.release()).SendSuccess(NULL);
     }
     delete this;
   } else {
     NOTREACHED();
   }
 }
 
 PageSnapshotTaker::PageSnapshotTaker(AutomationProvider* automation,
                                      IPC::Message* reply_message,
-                                     TabContentsWrapper* tab_contents,
+                                     TabContents* tab_contents,
                                      const FilePath& path)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       tab_contents_(tab_contents),
       image_path_(path) {
   registrar_.Add(this, chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN,
                  content::NotificationService::AllSources());
 }
 
 PageSnapshotTaker::~PageSnapshotTaker() {}
@@ skipping 321 matching lines @@
       if (automation_) {
         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();
-      TabContentsWrapper* tab =
-          TabContentsWrapper::GetCurrentWrapperForContents(
+      TabContents* tab =
+          TabContents::GetOwningTabContentsForWebContents(
               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 413 matching lines @@
                  chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  content::NOTIFICATION_LOAD_STOP,
                  content::NotificationService::AllSources());
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end();
        ++iter) {
     Browser* browser = *iter;
     for (int i = 0; i < browser->tab_count(); ++i) {
-      TabContentsWrapper* contents_wrapper =
-          browser->GetTabContentsWrapperAt(i);
-      StartObserving(contents_wrapper->automation_tab_helper());
-      if (contents_wrapper->automation_tab_helper()->has_pending_loads())
-        pending_tabs_.insert(contents_wrapper->web_contents());
+      TabContents* tab_contents = browser->GetTabContentsAt(i);
+      StartObserving(tab_contents->automation_tab_helper());
+      if (tab_contents->automation_tab_helper()->has_pending_loads())
+        pending_tabs_.insert(tab_contents->web_contents());
     }
   }
   CheckIfNoMorePendingLoads();
 }
 
 AllViewsStoppedLoadingObserver::~AllViewsStoppedLoadingObserver() {
 }
 
 void AllViewsStoppedLoadingObserver::OnFirstPendingLoad(
     content::WebContents* web_contents) {
@@ skipping 56 matching lines @@
   registrar_.Add(this,
                  chrome::NOTIFICATION_TAB_PARENTED,
                  content::NotificationService::AllSources());
 }
 
 void NewTabObserver::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_TAB_PARENTED, type);
   NavigationController* controller =
-      &(content::Source<TabContentsWrapper>(source).ptr()->
+      &(content::Source<TabContents>(source).ptr()->
           web_contents()->GetController());
   if (automation_) {
     // TODO(phajdan.jr): Clean up this hack. We write the correct return type
     // here, but don't send the message. NavigationNotificationObserver
     // will wait properly for the load to finish, and send the message,
     // but it will also append its own return value at the end of the reply.
     AutomationMsg_WindowExecuteCommand::WriteReplyParams(reply_message_.get(),
                                                          true);
     new NavigationNotificationObserver(controller, automation_,
                                        reply_message_.release(),
@@ skipping 292 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();
-    TabContentsWrapper* tab = TabContentsWrapper::GetCurrentWrapperForContents(
+    TabContents* tab = TabContents::GetOwningTabContentsForWebContents(
         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 {
@@ skipping 25 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;
   }
 }