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

chrome/browser/debugger/devtools_window.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 "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/in_process_webkit/session_storage_namespace.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 
@@ skipping 11 matching lines @@
   DevToolsClientHost* client_host = DevToolsManager::GetInstance()->
           GetDevToolsClientHostFor(inspected_tab->render_view_host());
   if (!client_host) {
     return NULL;
   }
 
   DevToolsWindow* window = client_host->AsDevToolsWindow();
   if (!window || !window->is_docked()) {
     return NULL;
   }
-  return window->tab_contents();
+  return window->tab_contents()->tab_contents();
 }
 
 DevToolsWindow::DevToolsWindow(Profile* profile,
                                RenderViewHost* inspected_rvh,
                                bool docked)
     : profile_(profile),
       browser_(NULL),
       docked_(docked),
       is_loaded_(false),
       action_on_load_(DEVTOOLS_TOGGLE_ACTION_NONE) {
   // Create TabContents with devtools.
-  tab_contents_ = new TabContents(profile, NULL, MSG_ROUTING_NONE, NULL, NULL);
-  tab_contents_->render_view_host()->AllowBindings(BindingsPolicy::DOM_UI);
+  tab_contents_ =
+      Browser::TabContentsFactory(profile, NULL, MSG_ROUTING_NONE, NULL, NULL);
+  tab_contents_->tab_contents()->
+      render_view_host()->AllowBindings(BindingsPolicy::DOM_UI);
   tab_contents_->controller().LoadURL(
       GetDevToolsUrl(), GURL(), PageTransition::START_PAGE);
 
   // Wipe out page icon so that the default application icon is used.
   NavigationEntry* entry = tab_contents_->controller().GetActiveEntry();
   entry->favicon().set_bitmap(SkBitmap());
   entry->favicon().set_is_valid(true);
 
   // Register on-load actions.
   registrar_.Add(this,
                  NotificationType::LOAD_STOP,
                  Source<NavigationController>(&tab_contents_->controller()));
   registrar_.Add(this,
                  NotificationType::TAB_CLOSING,
                  Source<NavigationController>(&tab_contents_->controller()));
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   inspected_tab_ = inspected_rvh->delegate()->GetAsTabContents();
 }
 
 DevToolsWindow::~DevToolsWindow() {
 }
 
 DevToolsWindow* DevToolsWindow::AsDevToolsWindow() {
   return this;
 }
 
 void DevToolsWindow::SendMessageToClient(const IPC::Message& message) {
-  RenderViewHost* target_host = tab_contents_->render_view_host();
+  RenderViewHost* target_host =
+      tab_contents_->tab_contents()->render_view_host();
   IPC::Message* m =  new IPC::Message(message);
   m->set_routing_id(target_host->routing_id());
   target_host->Send(m);
 }
 
 void DevToolsWindow::InspectedTabClosing() {
   if (docked_) {
     // Update dev tools to reflect removed dev tools window.
 
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
@@ skipping 14 matching lines @@
 }
 
 void DevToolsWindow::Show(DevToolsToggleAction action) {
   if (docked_) {
     Browser* inspected_browser;
     int inspected_tab_index;
     // Tell inspected browser to update splitter and switch to inspected panel.
     if (FindInspectedBrowserAndTabIndex(&inspected_browser,
                                         &inspected_tab_index)) {
       BrowserWindow* inspected_window = inspected_browser->window();
-      tab_contents_->set_delegate(this);
+      tab_contents_->tab_contents()->set_delegate(this);
       inspected_window->UpdateDevTools();
       SetAttachedWindow();
       tab_contents_->view()->SetInitialFocus();
       inspected_window->Show();
       TabStripModel* tabstrip_model = inspected_browser->tabstrip_model();
       tabstrip_model->SelectTabContentsAt(inspected_tab_index, true);
       ScheduleAction(action);
       return;
     } else {
       // Sometimes we don't know where to dock. Stay undocked.
@@ skipping 119 matching lines @@
                          L"WebInspector.setAttachedWindow(false);");
 }
 
 
 void DevToolsWindow::AddDevToolsExtensionsToClient() {
   if (inspected_tab_) {
     FundamentalValue tabId(inspected_tab_->controller().session_id().id());
     CallClientFunction(L"WebInspector.setInspectedTabId", tabId);
   }
   ListValue results;
-  const ExtensionsService* extension_service = tab_contents_->profile()->
-      GetOriginalProfile()->GetExtensionsService();
+  const ExtensionsService* extension_service =
+      tab_contents_->tab_contents()->profile()->
+          GetOriginalProfile()->GetExtensionsService();
   const ExtensionList* extensions = extension_service->extensions();
 
   for (ExtensionList::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     if ((*extension)->devtools_url().is_empty())
       continue;
     DictionaryValue* extension_info = new DictionaryValue();
     extension_info->Set("startPage",
         new StringValue((*extension)->devtools_url().spec()));
     results.Append(extension_info);
@@ skipping 113 matching lines @@
   return false;
 }
 
 void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   if (docked_) {
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window)
       inspected_window->HandleKeyboardEvent(event);
   }
 }