Translate: New Bubble UX (for the view toolkit)

chrome/browser/ui/views/location_bar/star_view.cc

Index: chrome/browser/ui/views/location_bar/star_view.cc
diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc
index 7a3c955843de0f4843997619d41bc0302e3d1257..147cce89c241a707fa264f04d38ed9bf48d12f60 100644
--- a/chrome/browser/ui/views/location_bar/star_view.cc
+++ b/chrome/browser/ui/views/location_bar/star_view.cc
@@ -8,24 +8,17 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
-#include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
-#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/events/event.h"
 
 StarView::StarView(CommandUpdater* command_updater)
-    : command_updater_(command_updater),
-      suppress_mouse_released_action_(false) {
+    : BubbleIconView(command_updater, IDC_BOOKMARK_PAGE_FROM_STAR) {
   set_id(VIEW_ID_STAR_BUTTON);
   SetToggled(false);
-  set_accessibility_focusable(true);
-  LocationBarView::InitTouchableLocationBarChildView(this);
 }
 
 StarView::~StarView() {}
@@ -37,64 +30,25 @@ void StarView::SetToggled(bool on) {
       on ? IDR_STAR_LIT : IDR_STAR));
 }
 
-void StarView::GetAccessibleState(ui::AccessibleViewState* state) {
-  ImageView::GetAccessibleState(state);
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+bool StarView::IsBubbleShowing() const {
+  return BookmarkBubbleView::IsShowing();
 }
 
-bool StarView::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
-  // Don't show tooltip to distract user if BookmarkBubbleView is showing.
-  if (BookmarkBubbleView::IsShowing())
-    return false;
-
-  return views::ImageView::GetTooltipText(p, tooltip);
-}
-
-bool StarView::OnMousePressed(const ui::MouseEvent& event) {
-  // If the bookmark bubble is showing then don't reshow it when the mouse is
-  // released.
-  suppress_mouse_released_action_ = BookmarkBubbleView::IsShowing();
-
-  // We want to show the bubble on mouse release; that is the standard behavior
-  // for buttons.
-  return true;
-}
-
-void StarView::OnMouseReleased(const ui::MouseEvent& event) {
-  // If this is the second click on this view then the bookmark bubble was
-  // showing on the mouse pressed event and is hidden now. Prevent the bubble
-  // from reshowing by doing nothing here.
-  if (suppress_mouse_released_action_) {
-    suppress_mouse_released_action_ = false;
-    return;
-  }
-
-  if (event.IsOnlyLeftMouseButton() && HitTestPoint(event.location())) {
-    UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint",
-                              BOOKMARK_ENTRY_POINT_STAR_MOUSE,
-                              BOOKMARK_ENTRY_POINT_LIMIT);
-    command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE_FROM_STAR);
-  }
-}
-
-bool StarView::OnKeyPressed(const ui::KeyEvent& event) {
-  if (event.key_code() == ui::VKEY_SPACE ||
-      event.key_code() == ui::VKEY_RETURN) {
-    UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint",
-                              BOOKMARK_ENTRY_POINT_STAR_KEY,
-                              BOOKMARK_ENTRY_POINT_LIMIT);
-    command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE_FROM_STAR);
-    return true;
-  }
-  return false;
-}
-
-void StarView::OnGestureEvent(ui::GestureEvent* event) {
-  if (event->type() == ui::ET_GESTURE_TAP) {
-    UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint",
-                              BOOKMARK_ENTRY_POINT_STAR_GESTURE,
-                              BOOKMARK_ENTRY_POINT_LIMIT);
-    command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE_FROM_STAR);
-    event->SetHandled();
+void StarView::OnExecuting(
+    BubbleIconView::ExecuteSource execute_source) {
+  BookmarkEntryPoint entry_point = BOOKMARK_ENTRY_POINT_STAR_MOUSE;
+  switch (execute_source) {
+    case EXECUTE_SOURCE_MOUSE:
+      entry_point = BOOKMARK_ENTRY_POINT_STAR_MOUSE;
+      break;
+    case EXECUTE_SOURCE_KEYBOARD:
+      entry_point = BOOKMARK_ENTRY_POINT_STAR_KEY;
+      break;
+    case EXECUTE_SOURCE_GESTURE:
+      entry_point = BOOKMARK_ENTRY_POINT_STAR_GESTURE;
+      break;
   }
+  UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint",
+                            entry_point,
+                            BOOKMARK_ENTRY_POINT_LIMIT);
 }