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

chrome/browser/extensions/extension_sidebar_api.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_sidebar_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sidebar/sidebar_container.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 // Errors.
@@ skipping 86 matching lines @@
 
   DictionaryValue* details = NULL;
   DictionaryValue default_details;
   if (IsArgumentListEmpty(args_.get())) {
     details = &default_details;
   } else {
     EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &details));
   }
 
   int tab_id;
-  TabContents* tab_contents = NULL;
+  TabContentsWrapper* tab_contents = NULL;
   if (details->HasKey(kTabIdKey)) {
     EXTENSION_FUNCTION_VALIDATE(details->GetInteger(kTabIdKey, &tab_id));
     if (!ExtensionTabUtil::GetTabById(tab_id, profile(), include_incognito(),
                                       NULL, NULL, &tab_contents, NULL)) {
       error_ = ExtensionErrorUtils::FormatErrorMessage(
           kNoTabError, base::IntToString(tab_id));
       return false;
     }
   } else {
     Browser* browser = GetCurrentBrowser();
     if (!browser) {
       error_ = kNoCurrentWindowError;
       return false;
     }
     if (!ExtensionTabUtil::GetDefaultTab(browser, &tab_contents, &tab_id)) {
       error_ = kNoDefaultTabError;
       return false;
     }
   }
   if (!tab_contents)
     return false;
 
   std::string content_id(GetExtension()->id());
-  return RunImpl(tab_contents, content_id, *details);
+  return RunImpl(tab_contents->tab_contents(), content_id, *details);
 }
 
 
 bool CollapseSidebarFunction::RunImpl(TabContents* tab,
                                       const std::string& content_id,
                                       const DictionaryValue& details) {
   SidebarManager::GetInstance()->CollapseSidebar(tab, content_id);
   return true;
 }
 
@@ skipping 26 matching lines @@
     // is displayed on it.
     if (active_sidebar && active_sidebar->content_id() == content_id) {
       if (!details.HasKey(kTabIdKey)) {
         is_active = NULL != GetCurrentBrowser();
       } else {
         int tab_id;
         EXTENSION_FUNCTION_VALIDATE(details.GetInteger(kTabIdKey, &tab_id));
 
         // Check if this tab is selected.
         Browser* browser = GetCurrentBrowser();
-        TabContents* contents = NULL;
+        TabContentsWrapper* contents = NULL;
         int default_tab_id = -1;
         if (browser &&
             ExtensionTabUtil::GetDefaultTab(browser, &contents,
                                             &default_tab_id)) {
           is_active = default_tab_id == tab_id;
         }
       }
     }
 
     result = is_active ? extension_sidebar_constants::kActiveState :
@@ skipping 69 matching lines @@
   SidebarManager::GetInstance()->SetSidebarTitle(tab, content_id, title);
   return true;
 }
 
 bool ShowSidebarFunction::RunImpl(TabContents* tab,
                                   const std::string& content_id,
                                   const DictionaryValue& details) {
   SidebarManager::GetInstance()->ShowSidebar(tab, content_id);
   return true;
 }