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

Unified Diff: chrome/browser/ui/views/location_bar/bubble_icon_view.cc

Issue 25373009: Translate: New Bubble UX (for the view toolkit) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix: view id on tests Created 7 years, 2 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/bubble_icon_view.cc
diff --git a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2a3d033b8e0b24c2ebd06012aa4de88916515a9f
--- /dev/null
+++ b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
@@ -0,0 +1,76 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/views/location_bar/bubble_icon_view.h"
+
+#include "chrome/browser/command_updater.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/events/event.h"
+
+BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id)
+ : command_updater_(command_updater),
+ command_id_(command_id),
+ suppress_mouse_released_action_(false) {
+ set_accessibility_focusable(true);
+ LocationBarView::InitTouchableLocationBarChildView(this);
+}
+
+BubbleIconView::~BubbleIconView() {
+}
+
+void BubbleIconView::GetAccessibleState(ui::AccessibleViewState* state) {
+ views::ImageView::GetAccessibleState(state);
+ state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+}
+
+bool BubbleIconView::GetTooltipText(const gfx::Point& p,
+ string16* tooltip) const {
+ if (IsBubbleShowing())
+ return false;
+
+ return views::ImageView::GetTooltipText(p, tooltip);
+}
+
+bool BubbleIconView::OnMousePressed(const ui::MouseEvent& event) {
+ // If the bubble is showing then don't reshow it when the mouse is released.
+ suppress_mouse_released_action_ = IsBubbleShowing();
+
+ // We want to show the bubble on mouse release; that is the standard behavior
+ // for buttons.
+ return true;
+}
+
+void BubbleIconView::OnMouseReleased(const ui::MouseEvent& event) {
+ // If this is the second click on this view then the 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())) {
+ OnExecuting(EXECUTE_SOURCE_MOUSE);
+ command_updater_->ExecuteCommand(command_id_);
+ }
+}
+
+bool BubbleIconView::OnKeyPressed(const ui::KeyEvent& event) {
+ if (event.key_code() == ui::VKEY_SPACE ||
+ event.key_code() == ui::VKEY_RETURN) {
+ OnExecuting(EXECUTE_SOURCE_KEYBOARD);
+ command_updater_->ExecuteCommand(command_id_);
+ return true;
+ }
+ return false;
+}
+
+void BubbleIconView::OnGestureEvent(ui::GestureEvent* event) {
+ if (event->type() == ui::ET_GESTURE_TAP) {
+ OnExecuting(EXECUTE_SOURCE_GESTURE);
+ command_updater_->ExecuteCommand(command_id_);
+ event->SetHandled();
+ }
+}
« no previous file with comments | « chrome/browser/ui/views/location_bar/bubble_icon_view.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698