| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 | 44 |
| 45 return ImageView::GetTooltipText(p, tooltip); | 45 return ImageView::GetTooltipText(p, tooltip); |
| 46 } | 46 } |
| 47 | 47 |
| 48 bool StarView::OnMousePressed(const views::MouseEvent& event) { | 48 bool StarView::OnMousePressed(const views::MouseEvent& event) { |
| 49 // We want to show the bubble on mouse release; that is the standard behavior | 49 // We want to show the bubble on mouse release; that is the standard behavior |
| 50 // for buttons. | 50 // for buttons. |
| 51 return true; | 51 return true; |
| 52 } | 52 } |
| 53 | 53 |
| 54 void StarView::OnMouseReleased(const views::MouseEvent& event, bool canceled) { | 54 void StarView::OnMouseReleased(const views::MouseEvent& event) { |
| 55 if (!canceled && HitTest(event.location())) | 55 if (HitTest(event.location())) |
| 56 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); | 56 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); |
| 57 } | 57 } |
| 58 | 58 |
| 59 bool StarView::OnKeyPressed(const views::KeyEvent& e) { | 59 bool StarView::OnKeyPressed(const views::KeyEvent& event) { |
| 60 if (e.key_code() == ui::VKEY_SPACE || e.key_code() == ui::VKEY_RETURN) { | 60 if (event.key_code() == ui::VKEY_SPACE || |
| 61 event.key_code() == ui::VKEY_RETURN) { |
| 61 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); | 62 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); |
| 62 return true; | 63 return true; |
| 63 } | 64 } |
| 64 return false; | 65 return false; |
| 65 } | 66 } |
| 66 | 67 |
| 67 void StarView::InfoBubbleClosing(InfoBubble* info_bubble, | 68 void StarView::InfoBubbleClosing(InfoBubble* info_bubble, |
| 68 bool closed_by_escape) { | 69 bool closed_by_escape) { |
| 69 } | 70 } |
| 70 | 71 |
| 71 bool StarView::CloseOnEscape() { | 72 bool StarView::CloseOnEscape() { |
| 72 return true; | 73 return true; |
| 73 } | 74 } |
| 74 | 75 |
| 75 bool StarView::FadeInOnShow() { | 76 bool StarView::FadeInOnShow() { |
| 76 return false; | 77 return false; |
| 77 } | 78 } |
| OLD | NEW |