TabContentsWrapper -> TabContents, part 37.

chrome/browser/ui/cocoa/web_intent_picker_cocoa.mm

 // Copyright (c) 2012 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/ui/cocoa/web_intent_picker_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/constrained_window_mac.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/web_intent_sheet_controller.h"
 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/gfx/image/image.h"
 
 using content::WebContents;
 
 namespace {
 
 // Since any delegates for constrained windows are tasked with deleting
 // themselves, and the WebIntentPicker needs to live longer than the
@@ skipping 26 matching lines @@
 void ConstrainedPickerSheetDelegate::DeleteDelegate() {
   if (is_sheet_open())
     [NSApp endSheet:sheet()];
 
   delete this;
 }
 
 }  // namespace
 
 // static
-WebIntentPicker* WebIntentPicker::Create(TabContentsWrapper* wrapper,
+WebIntentPicker* WebIntentPicker::Create(TabContents* tab_contents,
                                          WebIntentPickerDelegate* delegate,
                                          WebIntentPickerModel* model) {
-  return new WebIntentPickerCocoa(wrapper, delegate, model);
+  return new WebIntentPickerCocoa(tab_contents, delegate, model);
 }
 
 WebIntentPickerCocoa::WebIntentPickerCocoa()
     : delegate_(NULL),
       model_(NULL),
-      wrapper_(NULL),
+      tab_contents_(NULL),
       sheet_controller_(nil),
       service_invoked(false) {
 }
 
-WebIntentPickerCocoa::WebIntentPickerCocoa(TabContentsWrapper* wrapper,
+WebIntentPickerCocoa::WebIntentPickerCocoa(TabContents* tab_contents,
                                            WebIntentPickerDelegate* delegate,
                                            WebIntentPickerModel* model)
     : delegate_(delegate),
       model_(model),
-      wrapper_(wrapper),
+      tab_contents_(tab_contents),
       sheet_controller_(nil),
       service_invoked(false) {
   model_->set_observer(this);
 
   DCHECK(delegate);
-  DCHECK(wrapper);
+  DCHECK(tab_contents);
 
   sheet_controller_ = [
       [WebIntentPickerSheetController alloc] initWithPicker:this];
 
   // Deleted when ConstrainedPickerSheetDelegate::DeleteDelegate() runs.
   ConstrainedPickerSheetDelegate* constrained_delegate =
       new ConstrainedPickerSheetDelegate(this, sheet_controller_);
 
-  window_ = new ConstrainedWindowMac(wrapper, constrained_delegate);
+  window_ = new ConstrainedWindowMac(tab_contents, constrained_delegate);
 }
 
 WebIntentPickerCocoa::~WebIntentPickerCocoa() {
   if (model_ != NULL)
     model_->set_observer(NULL);
 }
 
 void WebIntentPickerCocoa::OnSheetDidEnd(NSWindow* sheet) {
   [sheet orderOut:sheet_controller_];
   if (window_)
@@ skipping 36 matching lines @@
 void WebIntentPickerCocoa::OnExtensionIconChanged(
     WebIntentPickerModel* model,
     const string16& extension_id) {
   // We don't handle individual icon changes - just redo the whole model.
   PerformLayout();
 }
 
 void WebIntentPickerCocoa::OnInlineDisposition(WebIntentPickerModel* model,
                                                const GURL& url) {
   content::WebContents* web_contents = content::WebContents::Create(
-      wrapper_->profile(),
-      tab_util::GetSiteInstanceForNewTab(wrapper_->profile(), url),
+      tab_contents_->profile(),
+      tab_util::GetSiteInstanceForNewTab(tab_contents_->profile(), url),
       MSG_ROUTING_NONE, NULL, NULL);
-  inline_disposition_tab_contents_.reset(new TabContentsWrapper(web_contents));
+  inline_disposition_tab_contents_.reset(new TabContents(web_contents));
   inline_disposition_delegate_.reset(
       new WebIntentInlineDispositionDelegate(this, web_contents,
-                                             wrapper_->profile()));
+                                             tab_contents_->profile()));
 
   // Must call this immediately after WebContents creation to avoid race
   // with load.
   delegate_->OnInlineDispositionWebContentsCreated(web_contents);
 
   inline_disposition_tab_contents_->web_contents()->GetController().LoadURL(
       url,
       content::Referrer(),
       content::PAGE_TRANSITION_START_PAGE,
       std::string());
@@ skipping 45 matching lines @@
 
 void WebIntentPickerCocoa::OnExtensionLinkClicked(const std::string& id) {
   DCHECK(delegate_);
   delegate_->OnExtensionLinkClicked(id);
 }
 
 void WebIntentPickerCocoa::OnSuggestionsLinkClicked() {
   DCHECK(delegate_);
   delegate_->OnSuggestionsLinkClicked();
 }