| Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| index 73b809db8abb6a64ca558794a47032a5a8529dcd..7c940f2c15c55ca1e2f6aa2f3136a2220455705a 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| @@ -30,10 +30,8 @@ class LocationBarDecoration;
|
| class LocationIconDecoration;
|
| class ManagePasswordsDecoration;
|
| class MicSearchDecoration;
|
| -class OriginChipDecoration;
|
| class PageActionDecoration;
|
| class Profile;
|
| -class SearchButtonDecoration;
|
| class SelectedKeywordDecoration;
|
| class StarDecoration;
|
| class TranslateDecoration;
|
| @@ -161,7 +159,6 @@ class LocationBarViewMac : public LocationBar,
|
| void OnChanged() override;
|
| void OnSetFocus() override;
|
| void ShowURL() override;
|
| - void EndOriginChipAnimations(bool cancel_fade) override;
|
| InstantController* GetInstant() override;
|
| content::WebContents* GetWebContents() override;
|
| ToolbarModel* GetToolbarModel() override;
|
| @@ -181,10 +178,6 @@ class LocationBarViewMac : public LocationBar,
|
|
|
| Browser* browser() const { return browser_; }
|
|
|
| - protected:
|
| - // OmniboxEditController:
|
| - void HideURL() override;
|
| -
|
| private:
|
| friend ZoomDecorationTest;
|
|
|
| @@ -263,12 +256,6 @@ class LocationBarViewMac : public LocationBar,
|
| // Generated CC hint decoration.
|
| scoped_ptr<GeneratedCreditCardDecoration> generated_credit_card_decoration_;
|
|
|
| - // The right-hand-side search button that is shown on search result pages.
|
| - scoped_ptr<SearchButtonDecoration> search_button_decoration_;
|
| -
|
| - // The left-hand-side origin chip.
|
| - scoped_ptr<OriginChipDecoration> origin_chip_decoration_;
|
| -
|
| // The right-hand-side button to manage passwords associated with a page.
|
| scoped_ptr<ManagePasswordsDecoration> manage_passwords_decoration_;
|
|
|
|
|