| Index: chrome/browser/ui/views/location_bar/location_bar_view.h
|
| diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
|
| index ea2a195a133123d7f7f06f7f2a8f8738d050bc6e..85f2d383078f2c99e42c3ab5d399148badd24971 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_bar_view.h
|
| +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
|
| @@ -49,7 +49,6 @@ class Profile;
|
| class SelectedKeywordView;
|
| class StarView;
|
| class TabContents;
|
| -typedef TabContents TabContentsWrapper;
|
| class TemplateURLService;
|
|
|
| namespace views {
|
| @@ -91,7 +90,7 @@ class LocationBarView : public LocationBar,
|
| class Delegate {
|
| public:
|
| // Should return the current tab contents.
|
| - virtual TabContentsWrapper* GetTabContentsWrapper() const = 0;
|
| + virtual TabContents* GetTabContents() const = 0;
|
|
|
| // Returns the InstantController, or NULL if there isn't one.
|
| virtual InstantController* GetInstant() = 0;
|
| @@ -263,7 +262,7 @@ class LocationBarView : public LocationBar,
|
| virtual SkBitmap GetFavicon() const OVERRIDE;
|
| virtual string16 GetTitle() const OVERRIDE;
|
| virtual InstantController* GetInstant() OVERRIDE;
|
| - virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE;
|
| + virtual TabContents* GetTabContents() const OVERRIDE;
|
|
|
| // Overridden from views::View:
|
| virtual std::string GetClassName() const OVERRIDE;
|
|
|