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/star_view.h" | 5 #include "chrome/browser/ui/views/location_bar/star_view.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/browser/command_updater.h" | 9 #include "chrome/browser/command_updater.h" |
10 #include "chrome/browser/ui/view_ids.h" | 10 #include "chrome/browser/ui/view_ids.h" |
11 #include "chrome/browser/ui/views/browser_dialogs.h" | 11 #include "chrome/browser/ui/views/browser_dialogs.h" |
12 #include "grit/generated_resources.h" | 12 #include "grit/generated_resources.h" |
13 #include "grit/theme_resources.h" | 13 #include "grit/theme_resources.h" |
14 #include "ui/base/accessibility/accessible_view_state.h" | 14 #include "ui/base/accessibility/accessible_view_state.h" |
| 15 #include "ui/base/event.h" |
15 #include "ui/base/l10n/l10n_util.h" | 16 #include "ui/base/l10n/l10n_util.h" |
16 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
17 | 18 |
18 StarView::StarView(CommandUpdater* command_updater) | 19 StarView::StarView(CommandUpdater* command_updater) |
19 : command_updater_(command_updater) { | 20 : command_updater_(command_updater) { |
20 set_id(VIEW_ID_STAR_BUTTON); | 21 set_id(VIEW_ID_STAR_BUTTON); |
21 SetToggled(false); | 22 SetToggled(false); |
22 set_accessibility_focusable(true); | 23 set_accessibility_focusable(true); |
23 TouchableLocationBarView::Init(this); | 24 TouchableLocationBarView::Init(this); |
24 } | 25 } |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 } | 63 } |
63 | 64 |
64 ui::GestureStatus StarView::OnGestureEvent(const views::GestureEvent& event) { | 65 ui::GestureStatus StarView::OnGestureEvent(const views::GestureEvent& event) { |
65 if (event.type() == ui::ET_GESTURE_TAP) { | 66 if (event.type() == ui::ET_GESTURE_TAP) { |
66 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); | 67 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); |
67 return ui::GESTURE_STATUS_CONSUMED; | 68 return ui::GESTURE_STATUS_CONSUMED; |
68 } | 69 } |
69 return ui::GESTURE_STATUS_UNKNOWN; | 70 return ui::GESTURE_STATUS_UNKNOWN; |
70 } | 71 } |
71 | 72 |
72 bool StarView::OnKeyPressed(const views::KeyEvent& event) { | 73 bool StarView::OnKeyPressed(const ui::KeyEvent& event) { |
73 if (event.key_code() == ui::VKEY_SPACE || | 74 if (event.key_code() == ui::VKEY_SPACE || |
74 event.key_code() == ui::VKEY_RETURN) { | 75 event.key_code() == ui::VKEY_RETURN) { |
75 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); | 76 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); |
76 return true; | 77 return true; |
77 } | 78 } |
78 return false; | 79 return false; |
79 } | 80 } |
OLD | NEW |