OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 5 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "grit/generated_resources.h" | 8 #include "grit/generated_resources.h" |
9 #include "ui/base/l10n/l10n_util.h" | 9 #include "ui/base/l10n/l10n_util.h" |
10 | 10 |
11 LocationIconView::LocationIconView(LocationBarView* location_bar) | 11 LocationIconView::LocationIconView(LocationBarView* location_bar) |
12 : ALLOW_THIS_IN_INITIALIZER_LIST(page_info_helper_(this, location_bar)) { | 12 : ALLOW_THIS_IN_INITIALIZER_LIST(page_info_helper_(this, location_bar)) { |
13 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON)); | 13 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON)); |
14 TouchableLocationBarView::Init(this); | 14 TouchableLocationBarView::Init(this); |
15 } | 15 } |
16 | 16 |
17 LocationIconView::~LocationIconView() { | 17 LocationIconView::~LocationIconView() { |
18 } | 18 } |
19 | 19 |
20 bool LocationIconView::OnMousePressed(const ui::MouseEvent& event) { | 20 bool LocationIconView::OnMousePressed(const ui::MouseEvent& event) { |
21 // We want to show the dialog on mouse release; that is the standard behavior | 21 // We want to show the dialog on mouse release; that is the standard behavior |
22 // for buttons. | 22 // for buttons. |
23 return true; | 23 return true; |
24 } | 24 } |
25 | 25 |
26 void LocationIconView::OnMouseReleased(const ui::MouseEvent& event) { | 26 void LocationIconView::OnMouseReleased(const ui::MouseEvent& event) { |
27 page_info_helper_.ProcessEvent(event); | 27 page_info_helper_.ProcessEvent(event); |
28 } | 28 } |
29 | 29 |
30 ui::EventResult LocationIconView::OnGestureEvent(ui::GestureEvent* event) { | 30 void LocationIconView::OnGestureEvent(ui::GestureEvent* event) { |
31 if (event->type() == ui::ET_GESTURE_TAP) { | 31 if (event->type() == ui::ET_GESTURE_TAP) { |
32 page_info_helper_.ProcessEvent(*event); | 32 page_info_helper_.ProcessEvent(*event); |
33 return ui::ER_CONSUMED; | 33 event->SetHandled(); |
34 } | 34 } |
35 return ui::ER_UNHANDLED; | |
36 } | 35 } |
37 | 36 |
38 int LocationIconView::GetBuiltInHorizontalPadding() const { | 37 int LocationIconView::GetBuiltInHorizontalPadding() const { |
39 return GetBuiltInHorizontalPaddingImpl(); | 38 return GetBuiltInHorizontalPaddingImpl(); |
40 } | 39 } |
41 | 40 |
42 void LocationIconView::ShowTooltip(bool show) { | 41 void LocationIconView::ShowTooltip(bool show) { |
43 if (show) { | 42 if (show) { |
44 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON)); | 43 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON)); |
45 } else { | 44 } else { |
46 SetTooltipText(string16()); | 45 SetTooltipText(string16()); |
47 } | 46 } |
48 } | 47 } |
OLD | NEW |