TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/web_intent_picker_views.cc

 // 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 <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
 #include "base/time.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_navigator.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/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
@@ skipping 626 matching lines @@
 
 // Views implementation of WebIntentPicker.
 class WebIntentPickerViews : public views::ButtonListener,
                              public views::DialogDelegate,
                              public views::LinkListener,
                              public WebIntentPicker,
                              public WebIntentPickerModelObserver,
                              public ServiceButtonsView::Delegate,
                              public SuggestedExtensionsRowView::Delegate {
  public:
-  WebIntentPickerViews(TabContentsWrapper* tab_contents,
+  WebIntentPickerViews(TabContents* tab_contents,
                        WebIntentPickerDelegate* delegate,
                        WebIntentPickerModel* model);
   virtual ~WebIntentPickerViews();
 
   // views::ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) OVERRIDE;
 
   // views::DialogDelegate implementation.
   virtual void WindowClosing() OVERRIDE;
@@ skipping 67 matching lines @@
   // Created locally, owned by Views.
   views::Label* suggestions_label_;
 
   // A weak pointer to the extensions view.
   // Created locally, owned by Views.
   SuggestedExtensionsView* extensions_;
 
   // Delegate for inline disposition tab contents.
   scoped_ptr<WebIntentInlineDispositionDelegate> inline_disposition_delegate_;
 
-  // A weak pointer to the wrapper of the WebContents this picker is in.
-  TabContentsWrapper* wrapper_;
+  // A weak pointer to the TabContents this picker is in.
+  TabContents* tab_contents_;
 
   // A weak pointer to the WebView that hosts the WebContents being displayed.
   // Created locally, owned by Views.
   views::WebView* webview_;
 
   // A weak pointer to the view that contains all other views in the picker.
   // Created locally, owned by Views.
   views::View* contents_;
 
   // A weak pointer to the constrained window.
@@ skipping 15 matching lines @@
   // The text for the current action.
   string16 action_text_;
 
   // Ownership of the WebContents we are displaying in the inline disposition.
   scoped_ptr<WebContents> inline_web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerViews);
 };
 
 // static
-WebIntentPicker* WebIntentPicker::Create(TabContentsWrapper* wrapper,
+WebIntentPicker* WebIntentPicker::Create(TabContents* tab_contents,
                                          WebIntentPickerDelegate* delegate,
                                          WebIntentPickerModel* model) {
-  return new WebIntentPickerViews(wrapper, delegate, model);
+  return new WebIntentPickerViews(tab_contents, delegate, model);
 }
 
-WebIntentPickerViews::WebIntentPickerViews(TabContentsWrapper* wrapper,
+WebIntentPickerViews::WebIntentPickerViews(TabContents* tab_contents,
                                            WebIntentPickerDelegate* delegate,
                                            WebIntentPickerModel* model)
     : delegate_(delegate),
       model_(model),
       service_buttons_(NULL),
       action_label_(NULL),
       suggestions_label_(NULL),
       extensions_(NULL),
-      wrapper_(wrapper),
-      webview_(new views::WebView(wrapper->profile())),
+      tab_contents_(tab_contents),
+      webview_(new views::WebView(tab_contents->profile())),
       contents_(NULL),
       window_(NULL),
       more_suggestions_link_(NULL),
       choose_another_service_link_(NULL),
       displaying_web_contents_(false) {
   model_->set_observer(this);
   InitContents();
 
   // Show the dialog.
-  window_ = new ConstrainedWindowViews(wrapper, this);
+  window_ = new ConstrainedWindowViews(tab_contents, this);
 }
 
 WebIntentPickerViews::~WebIntentPickerViews() {
   model_->set_observer(NULL);
 }
 
 void WebIntentPickerViews::ButtonPressed(views::Button* sender,
                                          const views::Event& event) {
 #if defined(USE_CLOSE_BUTTON)
   delegate_->OnPickerCancelled();
@@ skipping 155 matching lines @@
     WebIntentPickerModel* model,
     const string16& extension_id) {
   extensions_->Update();
   contents_->Layout();
   SizeToContents();
 }
 
 void WebIntentPickerViews::OnInlineDisposition(
     WebIntentPickerModel* model, const GURL& url) {
   if (!webview_)
-    webview_ = new views::WebView(wrapper_->profile());
+    webview_ = new views::WebView(tab_contents_->profile());
 
   inline_web_contents_.reset(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));
   // Does not take ownership, so we keep a scoped_ptr
   // for the WebContents locally.
   webview_->SetWebContents(inline_web_contents_.get());
   inline_disposition_delegate_.reset(
       new WebIntentInlineDispositionDelegate(this, inline_web_contents_.get(),
-                                             wrapper_->profile()));
+                                             tab_contents_->profile()));
   content::WebContents* web_contents = webview_->GetWebContents();
 
   const WebIntentPickerModel::InstalledService* service =
       model->GetInstalledServiceWithURL(url);
   DCHECK(service);
 
   // Must call this immediately after WebContents creation to avoid race
   // with load.
   delegate_->OnInlineDispositionWebContentsCreated(web_contents);
   web_contents->GetController().LoadURL(
@@ skipping 150 matching lines @@
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
   close_button->SetImage(views::CustomButton::BS_HOT,
                           rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
   close_button->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
   return close_button;
 }
 #endif