Make pink's TabContentsWrapper change compile on Windows....

chrome/browser/extensions/extension_browser_event_router.cc

 // Copyright (c) 2010 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/extensions/extension_browser_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_page_actions_module_constants.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents_wrapper.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 
 namespace events = extension_event_names;
 namespace tab_keys = extension_tabs_module_constants;
 namespace page_action_keys = extension_page_actions_module_constants;
 
@@ skipping 104 matching lines @@
   // Init() can happen after the browser is running, so catch up with any
   // windows that already exist.
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end(); ++iter) {
     RegisterForBrowserNotifications(*iter);
 
     // Also catch up our internal bookkeeping of tab entries.
     Browser* browser = *iter;
     if (browser->tabstrip_model()) {
       for (int i = 0; i < browser->tabstrip_model()->count(); ++i) {
-        TabContents* contents = browser->tabstrip_model()->GetTabContentsAt(i);
+        TabContents* contents = browser->GetTabContentsAt(i);
         int tab_id = ExtensionTabUtil::GetTabId(contents);
         tab_entries_[tab_id] = TabEntry();
       }
     }
   }
 
   initialized_ = true;
 }
 
 ExtensionBrowserEventRouter::ExtensionBrowserEventRouter()
@@ skipping 13 matching lines @@
   browser->tabstrip_model()->AddObserver(this);
 
   // If this is a new window, it isn't ready at this point, so we register to be
   // notified when it is. If this is an existing window, this is a no-op that we
   // just do to reduce code complexity.
   registrar_.Add(this, NotificationType::BROWSER_WINDOW_READY,
       Source<const Browser>(browser));
 
   if (browser->tabstrip_model()) {
     for (int i = 0; i < browser->tabstrip_model()->count(); ++i)
-      RegisterForTabNotifications(
-          browser->tabstrip_model()->GetTabContentsAt(i));
+      RegisterForTabNotifications(browser->GetTabContentsAt(i));
   }
 }
 
 void ExtensionBrowserEventRouter::RegisterForTabNotifications(
     TabContents* contents) {
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  Source<NavigationController>(&contents->controller()));
 
   // Observing TAB_CONTENTS_DESTROYED is necessary because it's
   // possible for tabs to be created, detached and then destroyed without
@@ skipping 72 matching lines @@
 
 void ExtensionBrowserEventRouter::TabCreatedAt(TabContents* contents,
                                                int index,
                                                bool foreground) {
   DispatchEventWithTab(contents->profile(), "", events::kOnTabCreated,
                        contents);
 
   RegisterForTabNotifications(contents);
 }
 
-void ExtensionBrowserEventRouter::TabInsertedAt(TabContents* contents,
+void ExtensionBrowserEventRouter::TabInsertedAt(TabContentsWrapper* contents,
                                                 int index,
                                                 bool foreground) {
   // If tab is new, send created event.
-  int tab_id = ExtensionTabUtil::GetTabId(contents);
-  if (!GetTabEntry(contents)) {
+  int tab_id = ExtensionTabUtil::GetTabId(contents->tab_contents());
+  if (!GetTabEntry(contents->tab_contents())) {
     tab_entries_[tab_id] = TabEntry();
 
-    TabCreatedAt(contents, index, foreground);
+    TabCreatedAt(contents->tab_contents(), index, foreground);
     return;
   }
 
   ListValue args;
   args.Append(Value::CreateIntegerValue(tab_id));
 
   DictionaryValue* object_args = new DictionaryValue();
   object_args->Set(tab_keys::kNewWindowIdKey, Value::CreateIntegerValue(
-      ExtensionTabUtil::GetWindowIdOfTab(contents)));
+      ExtensionTabUtil::GetWindowIdOfTab(contents->tab_contents())));
   object_args->Set(tab_keys::kNewPositionKey, Value::CreateIntegerValue(
       index));
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   DispatchEvent(contents->profile(), events::kOnTabAttached, json_args);
 }
 
-void ExtensionBrowserEventRouter::TabDetachedAt(TabContents* contents,
+void ExtensionBrowserEventRouter::TabDetachedAt(TabContentsWrapper* contents,
                                                 int index) {
-  if (!GetTabEntry(contents)) {
+  if (!GetTabEntry(contents->tab_contents())) {
     // The tab was removed. Don't send detach event.
     return;
   }
 
   ListValue args;
-  args.Append(Value::CreateIntegerValue(ExtensionTabUtil::GetTabId(contents)));
+  args.Append(Value::CreateIntegerValue(
+      ExtensionTabUtil::GetTabId(contents->tab_contents())));
 
   DictionaryValue* object_args = new DictionaryValue();
   object_args->Set(tab_keys::kOldWindowIdKey, Value::CreateIntegerValue(
-      ExtensionTabUtil::GetWindowIdOfTab(contents)));
+      ExtensionTabUtil::GetWindowIdOfTab(contents->tab_contents())));
   object_args->Set(tab_keys::kOldPositionKey, Value::CreateIntegerValue(
       index));
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   DispatchEvent(contents->profile(), events::kOnTabDetached, json_args);
 }
 
 void ExtensionBrowserEventRouter::TabClosingAt(TabStripModel* tab_strip_model,
-                                               TabContents* contents,
+                                               TabContentsWrapper* contents,
                                                int index) {
-  int tab_id = ExtensionTabUtil::GetTabId(contents);
+  int tab_id = ExtensionTabUtil::GetTabId(contents->tab_contents());
 
   ListValue args;
   args.Append(Value::CreateIntegerValue(tab_id));
 
   DictionaryValue* object_args = new DictionaryValue();
   object_args->SetBoolean(tab_keys::kWindowClosing,
                           tab_strip_model->closing_all());
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   DispatchEvent(contents->profile(), events::kOnTabRemoved, json_args);
 
   int removed_count = tab_entries_.erase(tab_id);
   DCHECK_GT(removed_count, 0);
 
-  UnregisterForTabNotifications(contents);
+  UnregisterForTabNotifications(contents->tab_contents());
 }
 
-void ExtensionBrowserEventRouter::TabSelectedAt(TabContents* old_contents,
-                                                TabContents* new_contents,
-                                                int index,
-                                                bool user_gesture) {
+void ExtensionBrowserEventRouter::TabSelectedAt(
+    TabContentsWrapper* old_contents,
+    TabContentsWrapper* new_contents,
+    int index,
+    bool user_gesture) {
   ListValue args;
   args.Append(Value::CreateIntegerValue(
-      ExtensionTabUtil::GetTabId(new_contents)));
+      ExtensionTabUtil::GetTabId(new_contents->tab_contents())));
 
   DictionaryValue* object_args = new DictionaryValue();
   object_args->Set(tab_keys::kWindowIdKey, Value::CreateIntegerValue(
-      ExtensionTabUtil::GetWindowIdOfTab(new_contents)));
+      ExtensionTabUtil::GetWindowIdOfTab(new_contents->tab_contents())));
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   DispatchEvent(new_contents->profile(), events::kOnTabSelectionChanged,
                 json_args);
 }
 
-void ExtensionBrowserEventRouter::TabMoved(TabContents* contents,
+void ExtensionBrowserEventRouter::TabMoved(TabContentsWrapper* contents,
                                            int from_index,
                                            int to_index) {
   ListValue args;
-  args.Append(Value::CreateIntegerValue(ExtensionTabUtil::GetTabId(contents)));
+  args.Append(Value::CreateIntegerValue(
+      ExtensionTabUtil::GetTabId(contents->tab_contents())));
 
   DictionaryValue* object_args = new DictionaryValue();
   object_args->Set(tab_keys::kWindowIdKey, Value::CreateIntegerValue(
-      ExtensionTabUtil::GetWindowIdOfTab(contents)));
+      ExtensionTabUtil::GetWindowIdOfTab(contents->tab_contents())));
   object_args->Set(tab_keys::kFromIndexKey, Value::CreateIntegerValue(
       from_index));
   object_args->Set(tab_keys::kToIndexKey, Value::CreateIntegerValue(
       to_index));
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   DispatchEvent(contents->profile(), events::kOnTabMoved, json_args);
@@ skipping 67 matching lines @@
     OnBrowserWindowReady(browser);
 #if defined(OS_MACOSX)
   } else if (type == NotificationType::NO_KEY_WINDOW) {
     OnBrowserSetLastActive(NULL);
 #endif
   } else {
     NOTREACHED();
   }
 }
 
-void ExtensionBrowserEventRouter::TabChangedAt(TabContents* contents,
+void ExtensionBrowserEventRouter::TabChangedAt(TabContentsWrapper* contents,
                                                int index,
                                                TabChangeType change_type) {
-  TabUpdated(contents, false);
+  TabUpdated(contents->tab_contents(), false);
 }
 
-void ExtensionBrowserEventRouter::TabReplacedAt(TabContents* old_contents,
-                                                TabContents* new_contents,
-                                                int index) {
-  UnregisterForTabNotifications(old_contents);
-  RegisterForTabNotifications(new_contents);
+void ExtensionBrowserEventRouter::TabReplacedAt(
+    TabContentsWrapper* old_contents,
+    TabContentsWrapper* new_contents,
+    int index) {
+  UnregisterForTabNotifications(old_contents->tab_contents());
+  RegisterForTabNotifications(new_contents->tab_contents());
 }
 
-void ExtensionBrowserEventRouter::TabPinnedStateChanged(TabContents* contents,
-                                                        int index) {
+void ExtensionBrowserEventRouter::TabPinnedStateChanged(
+    TabContentsWrapper* contents,
+    int index) {
   TabStripModel* tab_strip = NULL;
   int tab_index;
 
-  if (ExtensionTabUtil::GetTabStripModel(contents, &tab_strip, &tab_index)) {
+  if (ExtensionTabUtil::GetTabStripModel(
+        contents->tab_contents(), &tab_strip, &tab_index)) {
     DictionaryValue* changed_properties = new DictionaryValue();
     changed_properties->SetBoolean(tab_keys::kPinnedKey,
                                    tab_strip->IsTabPinned(tab_index));
-    DispatchTabUpdatedEvent(contents, changed_properties);
+    DispatchTabUpdatedEvent(contents->tab_contents(), changed_properties);
   }
 }
 
 void ExtensionBrowserEventRouter::TabStripEmpty() {}
 
 void ExtensionBrowserEventRouter::DispatchOldPageActionEvent(
     Profile* profile,
     const std::string& extension_id,
     const std::string& page_action_id,
     int tab_id,
@@ skipping 16 matching lines @@
 
 void ExtensionBrowserEventRouter::PageActionExecuted(
     Profile* profile,
     const std::string& extension_id,
     const std::string& page_action_id,
     int tab_id,
     const std::string& url,
     int button) {
   DispatchOldPageActionEvent(profile, extension_id, page_action_id, tab_id, url,
                              button);
-  TabContents* tab_contents = NULL;
+  TabContentsWrapper* tab_contents = NULL;
   if (!ExtensionTabUtil::GetTabById(tab_id, profile, profile->IsOffTheRecord(),
                                     NULL, NULL, &tab_contents, NULL)) {
     return;
   }
   DispatchEventWithTab(profile, extension_id, "pageAction.onClicked",
-                       tab_contents);
+                       tab_contents->tab_contents());
 }
 
 void ExtensionBrowserEventRouter::BrowserActionExecuted(
     Profile* profile, const std::string& extension_id, Browser* browser) {
-  TabContents* tab_contents = NULL;
+  TabContentsWrapper* tab_contents = NULL;
   int tab_id = 0;
   if (!ExtensionTabUtil::GetDefaultTab(browser, &tab_contents, &tab_id))
     return;
   DispatchEventWithTab(profile, extension_id, "browserAction.onClicked",
-                       tab_contents);
+                       tab_contents->tab_contents());
 }