Chromium Code Reviews| Index: chrome/browser/ui/views/new_back_shortcut_bubble.cc |
| diff --git a/chrome/browser/ui/views/new_back_shortcut_bubble.cc b/chrome/browser/ui/views/new_back_shortcut_bubble.cc |
| index 7c9b115751c522b9f7b4bfa17b22e28c477111e6..21a62386cd9929edb22c869ebb05ce37e440ecf2 100644 |
| --- a/chrome/browser/ui/views/new_back_shortcut_bubble.cc |
| +++ b/chrome/browser/ui/views/new_back_shortcut_bubble.cc |
| @@ -33,8 +33,7 @@ const int kShowDurationMs = 3800; |
| } |
| NewBackShortcutBubble::NewBackShortcutBubble( |
| - ExclusiveAccessBubbleViewsContext* context, |
| - bool forward) |
| + ExclusiveAccessBubbleViewsContext* context) |
| : bubble_view_context_(context), |
| animation_(new gfx::SlideAnimation(this)), |
| view_(new SubtleNotificationView(nullptr)), |
| @@ -42,7 +41,6 @@ NewBackShortcutBubble::NewBackShortcutBubble( |
| bubble_view_context_->GetBubbleParentView(), |
| view_, |
| false)) { |
| - UpdateContent(forward); |
|
Peter Kasting
2016/06/07 08:04:23
Removing this was not strictly necessary, but did
Matt Giuca
2016/06/08 01:29:03
OK. I commented about this in the top of BrowserVi
|
| } |
| NewBackShortcutBubble::~NewBackShortcutBubble() { |
| @@ -52,6 +50,10 @@ NewBackShortcutBubble::~NewBackShortcutBubble() { |
| base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, popup_); |
| } |
| +bool NewBackShortcutBubble::IsVisible() const { |
| + return popup_->IsVisible(); |
| +} |
| + |
| void NewBackShortcutBubble::UpdateContent(bool forward) { |
| // Note: The key names are parameters so that we can vary by operating system |
| // or change the direction of the arrow as necessary (see |
| @@ -85,6 +87,11 @@ void NewBackShortcutBubble::UpdateContent(bool forward) { |
| &NewBackShortcutBubble::OnTimerElapsed); |
| } |
| +void NewBackShortcutBubble::Hide() { |
| + hide_timeout_.Stop(); |
| + OnTimerElapsed(); |
| +} |
| + |
| void NewBackShortcutBubble::AnimationProgressed( |
| const gfx::Animation* animation) { |
| float opacity = static_cast<float>(animation_->CurrentValueBetween(0.0, 1.0)); |