Remove TabContents from OmniboxEditController and friends.

chrome/browser/ui/gtk/location_bar_view_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
@@ skipping 63 matching lines @@
   GtkWidget* widget() { return hbox_.get(); }
 
   // Returns the widget the page info bubble should point to.
   GtkWidget* location_icon_widget() const { return location_icon_image_; }
 
   // Returns the widget the extension installed bubble should point to.
   GtkWidget* location_entry_widget() const { return entry_box_; }
 
   Browser* browser() const { return browser_; }
 
-  // Returns the current WebContents.
-  content::WebContents* GetWebContents() const;
-
   // Sets |preview_enabled| for the PageActionViewGtk associated with this
   // |page_action|. If |preview_enabled| is true, the view will display the
   // page action's icon even though it has not been activated by the extension.
   // This is used by the ExtensionInstalledBubbleGtk to preview what the icon
   // will look like for the user upon installation of the extension.
   void SetPreviewEnabledPageAction(ExtensionAction *page_action,
                                    bool preview_enabled);
 
   // Retrieves the GtkWidget which is associated with PageActionView
   // corresponding to |page_action|.
@@ skipping 26 matching lines @@
                                     content::PageTransition transition,
                                     const GURL& alternate_nav_url) OVERRIDE;
   virtual void OnChanged() OVERRIDE;
   virtual void OnSelectionBoundsChanged() OVERRIDE;
   virtual void OnKillFocus() OVERRIDE;
   virtual void OnSetFocus() OVERRIDE;
   virtual void OnInputInProgress(bool in_progress) OVERRIDE;
   virtual gfx::Image GetFavicon() const OVERRIDE;
   virtual string16 GetTitle() const OVERRIDE;
   virtual InstantController* GetInstant() OVERRIDE;
-  virtual TabContents* GetTabContents() const OVERRIDE;
+  virtual content::WebContents* GetWebContents() const OVERRIDE;
 
   // LocationBar:
   virtual void ShowFirstRunBubble() OVERRIDE;
   virtual void SetInstantSuggestion(
       const InstantSuggestion& suggestion) OVERRIDE;
   virtual string16 GetInputString() const OVERRIDE;
   virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
   virtual content::PageTransition GetPageTransition() const OVERRIDE;
   virtual void AcceptInput() OVERRIDE;
   virtual void FocusLocation(bool select_all) OVERRIDE;
@@ skipping 33 matching lines @@
   // Superclass for content settings icons shown at the left side of the
   // location bar.
   class PageToolViewGtk : public ui::AnimationDelegate {
    public:
     explicit PageToolViewGtk(const LocationBarViewGtk* parent);
     virtual ~PageToolViewGtk();
 
     GtkWidget* widget();
 
     bool IsVisible();
-    virtual void Update(TabContents* tab_contents) = 0;
+    virtual void Update(content::WebContents* web_contents) = 0;
 
     // Overridden from ui::AnimationDelegate:
     virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
     virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
     virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
 
    protected:
     // Theme constants for solid background elements.
     virtual GdkColor button_border_color() const = 0;
     virtual GdkColor gradient_top_color() const = 0;
@@ skipping 339 matching lines @@
   BooleanPrefMember edit_bookmarks_enabled_;
 
   // Used to remember the URL and title text when drag&drop has begun.
   GURL drag_url_;
   string16 drag_title_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_