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

chrome/browser/extensions/execute_code_in_tab_function.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/execute_code_in_tab_function.h"
 
 #include "base/callback.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/ui/browser.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/notification_service.h"
 
 namespace keys = extension_tabs_module_constants;
 
 ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
     : execute_tab_id_(-1),
@@ skipping 17 matching lines @@
       error_ = keys::kMoreThanOneValuesError;
       return false;
     } else if (!has_code && !has_file) {
       error_ = keys::kNoCodeOrFileToExecuteError;
       return false;
     }
   }
 
   execute_tab_id_ = -1;
   Browser* browser = NULL;
-  TabContents* contents = NULL;
+  TabContentsWrapper* contents = NULL;
 
   // If |tab_id| is specified, look for it. Otherwise default to selected tab
   // in the current window.
   Value* tab_value = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &tab_value));
   if (tab_value->IsType(Value::TYPE_NULL)) {
     browser = GetCurrentBrowser();
     if (!browser) {
       error_ = keys::kNoCurrentWindowError;
       return false;
@@ skipping 11 matching lines @@
 
   DCHECK(browser);
   DCHECK(contents);
 
   // NOTE: This can give the wrong answer due to race conditions, but it is OK,
   // we check again in the renderer.
   const Extension* extension = GetExtension();
   const std::vector<URLPattern> host_permissions =
       extension->host_permissions();
   if (!Extension::CanExecuteScriptOnPage(
-        contents->GetURL(),
+        contents->tab_contents()->GetURL(),
         extension->CanExecuteScriptEverywhere(),
         &host_permissions,
         NULL,
         &error_)) {
     return false;
   }
 
   if (script_info->HasKey(keys::kAllFramesKey)) {
     if (!script_info->GetBoolean(keys::kAllFramesKey, &all_frames_))
       return false;
@@ skipping 43 matching lines @@
 #elif defined(OS_WIN)
     error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kLoadFileError,
         WideToUTF8(resource_.relative_path().value()));
 #endif  // OS_WIN
     SendResponse(false);
   }
   Release();  // Balance the AddRef taken in RunImpl
 }
 
 bool ExecuteCodeInTabFunction::Execute(const std::string& code_string) {
-  TabContents* contents = NULL;
+  TabContentsWrapper* contents = NULL;
   Browser* browser = NULL;
 
   bool success = ExtensionTabUtil::GetTabById(
       execute_tab_id_, profile(), include_incognito(), &browser, NULL,
       &contents, NULL) && contents && browser;
 
   if (!success) {
     SendResponse(false);
     return false;
   }
 
   const Extension* extension = GetExtension();
   if (!extension) {
     SendResponse(false);
     return false;
   }
 
   bool is_js_code = true;
   std::string function_name = name();
   if (function_name == TabsInsertCSSFunction::function_name()) {
     is_js_code = false;
   } else if (function_name != TabsExecuteScriptFunction::function_name()) {
     DCHECK(false);
   }
-  if (!contents->ExecuteCode(request_id(), extension->id(),
-                             is_js_code, code_string, all_frames_)) {
+  if (!contents->tab_contents()->ExecuteCode(request_id(), extension->id(),
+      is_js_code, code_string, all_frames_)) {
     SendResponse(false);
     return false;
   }
   registrar_.Add(this, NotificationType::TAB_CODE_EXECUTED,
                  NotificationService::AllSources());
   AddRef();  // balanced in Observe()
   return true;
 }
 
 void ExecuteCodeInTabFunction::Observe(NotificationType type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
   std::pair<int, bool>* result_details =
       Details<std::pair<int, bool> >(details).ptr();
   if (result_details->first == request_id()) {
     SendResponse(result_details->second);
     Release();  // balanced in Execute()
   }
 }