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 0672ef07b967d7a1f5611b69b906cd5191742c51..c41139b3af62e28ccab34210f12d7950ee8a18a0 100644 |
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h |
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h |
@@ -53,6 +53,10 @@ namespace content { |
struct SSLStatus; |
} |
+namespace gfx { |
+class SlideAnimation; |
+} |
+ |
namespace views { |
class BubbleDelegateView; |
class ImageButton; |
@@ -74,6 +78,7 @@ class LocationBarView : public LocationBar, |
public views::View, |
public views::ButtonListener, |
public views::DragController, |
+ public gfx::AnimationDelegate, |
public OmniboxEditController, |
public DropdownBarHostDelegate, |
public TemplateURLServiceObserver, |
@@ -347,6 +352,7 @@ class LocationBarView : public LocationBar, |
void UpdateManagePasswordsIconAndBubble() override; |
void UpdatePageActions() override; |
void UpdateBookmarkStarVisibility() override; |
+ void UpdateLocationBarState(bool visible, bool animation) override; |
bool ShowPageActionPopup(const extensions::Extension* extension, |
bool grant_active_tab) override; |
void UpdateOpenPDFInReaderPrompt() override; |
@@ -383,6 +389,10 @@ class LocationBarView : public LocationBar, |
const gfx::Point& press_pt, |
const gfx::Point& p) override; |
+ // gfx::AnimationDelegate: |
+ void AnimationProgressed(const gfx::Animation* animation) override; |
+ void AnimationEnded(const gfx::Animation* animation) override; |
+ |
// OmniboxEditController: |
void OnChanged() override; |
void OnSetFocus() override; |
@@ -468,6 +478,9 @@ class LocationBarView : public LocationBar, |
// The star. |
StarView* star_view_; |
+ // Animation to control showing / hiding the location bar. |
+ scoped_ptr<gfx::SlideAnimation> size_animation_; |
Peter Kasting
2015/04/01 20:27:43
Why a scoped_ptr? Seems like this could just be a
benwells
2015/04/02 00:36:54
Done.
|
+ |
// Whether we're in popup mode. This value also controls whether the location |
// bar is read-only. |
const bool is_popup_mode_; |