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

chrome/browser/extensions/extension_page_actions_module.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_page_actions_module.h"
 
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_page_actions_module_constants.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extensions_service.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/ui/browser.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/render_messages.h"
 
 namespace keys = extension_page_actions_module_constants;
 
 namespace {
 // Errors.
@@ skipping 35 matching lines @@
     return false;
   }
 
   if (icon_id < 0 ||
       static_cast<size_t>(icon_id) >= page_action->icon_paths()->size()) {
     error_ = (icon_id == 0) ? kNoIconSpecified : kIconIndexOutOfBounds;
     return false;
   }
 
   // Find the TabContents that contains this tab id.
-  TabContents* contents = NULL;
+  TabContentsWrapper* contents = NULL;
   bool result = ExtensionTabUtil::GetTabById(
       tab_id, profile(), include_incognito(), NULL, NULL, &contents, NULL);
   if (!result || !contents) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         kNoTabError, base::IntToString(tab_id));
     return false;
   }
 
   // Make sure the URL hasn't changed.
   NavigationEntry* entry = contents->controller().GetActiveEntry();
   if (!entry || url != entry->url().spec()) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(kUrlNotActiveError, url);
     return false;
   }
 
   // Set visibility and broadcast notifications that the UI should be updated.
   page_action->SetIsVisible(tab_id, enable);
   page_action->SetTitle(tab_id, title);
   page_action->SetIconIndex(tab_id, icon_id);
-  contents->PageActionStateChanged();
+  contents->tab_contents()->PageActionStateChanged();
 
   return true;
 }
 
 bool PageActionFunction::InitCommon(int tab_id) {
   page_action_ = GetExtension()->page_action();
   if (!page_action_) {
     error_ = kNoPageActionError;
     return false;
   }
 
   // Find the TabContents that contains this tab id.
   contents_ = NULL;
+  TabContentsWrapper* wrapper = NULL;
   bool result = ExtensionTabUtil::GetTabById(
-      tab_id, profile(), include_incognito(), NULL, NULL, &contents_, NULL);
-  if (!result || !contents_) {
+      tab_id, profile(), include_incognito(), NULL, NULL, &wrapper, NULL);
+  if (!result || !wrapper) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         kNoTabError, base::IntToString(tab_id));
     return false;
   }
+  contents_ = wrapper->tab_contents();
 
   return true;
 }
 
 bool PageActionFunction::SetVisible(bool visible) {
   int tab_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id));
   if (!InitCommon(tab_id))
     return false;
 
@@ skipping 157 matching lines @@
   if (!InitCommon(tab_id))
     return false;
 
   std::string text;
   EXTENSION_FUNCTION_VALIDATE(args->GetString("text", &text));
 
   page_action_->SetBadgeText(tab_id, text);
   contents_->PageActionStateChanged();
   return true;
 }