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

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

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp file and bad merge Created 5 years, 10 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 b10e6833d197be66af859e724e49060bc8eb8647..b2d170b1b9d59acabe29bf3c6c6d649ccf58f871 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
@@ -31,7 +31,6 @@ class LocationBarDecoration;
class LocationIconDecoration;
class ManagePasswordsDecoration;
class MicSearchDecoration;
-class OriginChipDecoration;
class PageActionDecoration;
class Profile;
class SearchButtonDecoration;
@@ -162,7 +161,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;
@@ -186,10 +184,6 @@ class LocationBarViewMac : public LocationBar,
// Updates the view for the zoom icon when default zoom levels change.
void OnDefaultZoomLevelChanged() override;
- protected:
- // OmniboxEditController:
- void HideURL() override;
-
private:
friend ZoomDecorationTest;
@@ -273,9 +267,6 @@ class LocationBarViewMac : public LocationBar,
// 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_;
« no previous file with comments | « chrome/browser/ui/browser_toolbar_model_delegate.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698