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

Unified Diff: chrome/browser/ui/views/location_bar/location_icon_view.h

Issue 2144903004: New location security strings and animation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't look at level any more Created 4 years, 4 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/views/location_bar/location_icon_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.h b/chrome/browser/ui/views/location_bar/location_icon_view.h
index f056a1c43e1930cd3ba6d47d3067bccfe2262377..8cf62c9357010e379f394517bab6217b669477e7 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.h
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.h
@@ -7,6 +7,8 @@
#include "base/macros.h"
#include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
class LocationBarView;
@@ -18,7 +20,8 @@ class LocatedEvent;
// Use a LocationIconView to display an icon on the leading side of the edit
// field. It shows the user's current action (while the user is editing), or the
// page security status (after navigation has completed).
-class LocationIconView : public IconLabelBubbleView {
+class LocationIconView : public IconLabelBubbleView,
+ public gfx::AnimationDelegate {
public:
LocationIconView(const gfx::FontList& font_list,
SkColor parent_background_color,
@@ -49,7 +52,20 @@ class LocationIconView : public IconLabelBubbleView {
// HTTPS contexts.
void SetBackground(bool should_show_ev);
+ void AnimateSecurityChip();
+ // Immediately show full security chip.
+ void ShowSecurityChip();
+ // Immediately hide security chip.
+ void HideSecurityChip();
+ bool IsAnimatingSecurityChip();
Peter Kasting 2016/08/26 20:59:12 This method seems to be unused.
Kevin Bailey 2016/08/29 13:38:10 Done.
+
private:
+ // IconLabelBubbleView:
+ double WidthMultiplier() const override;
+
+ // gfx::AnimationDelegate:
+ void AnimationProgressed(const gfx::Animation*) override;
+
void ProcessLocatedEvent(const ui::LocatedEvent& event);
// Returns what the minimum size would be if the preferred size were |size|.
@@ -68,6 +84,7 @@ class LocationIconView : public IconLabelBubbleView {
bool show_tooltip_;
LocationBarView* location_bar_;
+ gfx::SlideAnimation animation_;
DISALLOW_COPY_AND_ASSIGN(LocationIconView);
};

Powered by Google App Engine
This is Rietveld 408576698