Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 768413003: TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 7961185cbc6d823d833ef6edb4270b6c3fb55e3d..125e4add317250c54c75c6ff4dd98fb2cff4dac3 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;
@@ -160,7 +158,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;
@@ -180,10 +177,6 @@ class LocationBarViewMac : public LocationBar,
Browser* browser() const { return browser_; }
- protected:
- // OmniboxEditController:
- void HideURL() override;
-
private:
friend ZoomDecorationTest;
@@ -264,12 +257,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_;

Powered by Google App Engine
This is Rietveld 408576698