Remove unneeded TabContents::FromWebContents.

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 "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/constrained_window_constants.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.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 860 matching lines @@
 // WebIntentPickerViews --------------------------------------------------------
 
 // Views implementation of WebIntentPicker.
 class WebIntentPickerViews : public views::ButtonListener,
                              public views::WidgetDelegate,
                              public views::LinkListener,
                              public WebIntentPicker,
                              public WebIntentPickerModelObserver,
                              public IntentRowView::Delegate {
  public:
-  WebIntentPickerViews(TabContents* tab_contents,
+  WebIntentPickerViews(WebContents* web_contents,
                        WebIntentPickerDelegate* delegate,
                        WebIntentPickerModel* model);
   virtual ~WebIntentPickerViews();
 
   // views::ButtonListener implementation.
   // This method is called when the user cancels the picker dialog.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // views::WidgetDelegate implementation.
@@ skipping 92 matching lines @@
   // Created locally, owned by Views.
   views::Label* action_label_;
 
   // A weak pointer to the intents view.
   // Created locally, owned by Views view hierarchy.
   IntentsView* extensions_;
 
   // Delegate for inline disposition tab contents.
   scoped_ptr<WebIntentInlineDispositionDelegate> inline_disposition_delegate_;
 
-  // A weak pointer to the TabContents this picker is in.
-  TabContents* tab_contents_;
+  // A weak pointer to the WebContents this picker is in.
+  WebContents* web_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 28 matching lines @@
   // Signals if the picker can be closed. False during extension install.
   bool can_close_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerViews);
 };
 
 // static
 WebIntentPicker* WebIntentPicker::Create(content::WebContents* web_contents,
                                          WebIntentPickerDelegate* delegate,
                                          WebIntentPickerModel* model) {
-  TabContents* tab_contents = TabContents::FromWebContents(web_contents);
-  return new WebIntentPickerViews(tab_contents, delegate, model);
+  return new WebIntentPickerViews(web_contents, delegate, model);
 }
 
-WebIntentPickerViews::WebIntentPickerViews(TabContents* tab_contents,
+WebIntentPickerViews::WebIntentPickerViews(WebContents* web_contents,
                                            WebIntentPickerDelegate* delegate,
                                            WebIntentPickerModel* model)
     : state_(INITIAL),
       delegate_(delegate),
       model_(model),
       action_label_(NULL),
       extensions_(NULL),
-      tab_contents_(tab_contents),
-      webview_(new views::WebView(tab_contents->profile())),
+      web_contents_(web_contents),
+      webview_(new views::WebView(
+          Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
       window_(NULL),
       more_suggestions_link_(NULL),
       inline_service_icon_(NULL),
       choose_another_service_link_(NULL),
       waiting_view_(NULL),
       can_close_(true) {
   bool enable_chrome_style = true;
   use_close_button_ = enable_chrome_style;
 
   model_->set_observer(this);
   contents_ = new views::View();
   contents_->set_background(views::Background::CreateSolidBackground(
       ConstrainedWindow::GetBackgroundColor()));
 
   // Show the dialog.
-  window_ = new ConstrainedWindowViews(tab_contents->web_contents(), this,
+  window_ = new ConstrainedWindowViews(web_contents, this,
                                        enable_chrome_style,
                                        ConstrainedWindowViews::NO_INSETS);
   if (model_->IsInlineDisposition())
     OnInlineDisposition(string16(), model_->inline_disposition_url());
   else
     UpdateContents();
 }
 
 WebIntentPickerViews::~WebIntentPickerViews() {
   model_->set_observer(NULL);
@@ skipping 261 matching lines @@
 
 void WebIntentPickerViews::OnExtensionIconChanged(
     WebIntentPickerModel* model,
     const std::string& extension_id) {
   OnFaviconChanged(model, -1);
 }
 
 void WebIntentPickerViews::OnInlineDisposition(
     const string16&, const GURL& url) {
   DCHECK(delegate_);
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   if (!webview_)
-    webview_ = new views::WebView(tab_contents_->profile());
+    webview_ = new views::WebView(profile);
 
-  inline_web_contents_.reset(delegate_->CreateWebContentsForInlineDisposition(
-      tab_contents_->profile(), url));
+  inline_web_contents_.reset(
+      delegate_->CreateWebContentsForInlineDisposition(profile, url));
 
   // Does not take ownership, so we keep a scoped_ptr
   // for the WebContents locally.
   webview_->SetWebContents(inline_web_contents_.get());
-  Browser* browser = chrome::FindBrowserWithWebContents(
-      tab_contents_->web_contents());
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   inline_disposition_delegate_.reset(
       new WebIntentInlineDispositionDelegate(this, inline_web_contents_.get(),
                                              browser));
 
   inline_web_contents_->GetController().LoadURL(
       url,
       content::Referrer(),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 
@@ skipping 197 matching lines @@
   if (inline_service)
     inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia());
 }
 
 void WebIntentPickerViews::RefreshExtensions() {
   DCHECK(extensions_);
   extensions_->Update();
   contents_->Layout();
   SizeToContents();
 }