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/chrome_to_mobile_view.h" | 5 #include "chrome/browser/ui/views/location_bar/chrome_to_mobile_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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 | 61 |
62 return views::ImageView::GetTooltipText(p, tooltip); | 62 return views::ImageView::GetTooltipText(p, tooltip); |
63 } | 63 } |
64 | 64 |
65 bool ChromeToMobileView::OnMousePressed(const views::MouseEvent& event) { | 65 bool ChromeToMobileView::OnMousePressed(const views::MouseEvent& event) { |
66 // Show the bubble on mouse release; that is standard button behavior. | 66 // Show the bubble on mouse release; that is standard button behavior. |
67 return true; | 67 return true; |
68 } | 68 } |
69 | 69 |
70 void ChromeToMobileView::OnMouseReleased(const views::MouseEvent& event) { | 70 void ChromeToMobileView::OnMouseReleased(const views::MouseEvent& event) { |
71 if (event.IsOnlyLeftMouseButton() && HitTest(event.location())) | 71 if (event.IsOnlyLeftMouseButton() && HitTestPoint(event.location())) |
72 command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE); | 72 command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE); |
73 } | 73 } |
74 | 74 |
75 bool ChromeToMobileView::OnKeyPressed(const views::KeyEvent& event) { | 75 bool ChromeToMobileView::OnKeyPressed(const views::KeyEvent& event) { |
76 if (event.key_code() == ui::VKEY_SPACE || | 76 if (event.key_code() == ui::VKEY_SPACE || |
77 event.key_code() == ui::VKEY_RETURN) { | 77 event.key_code() == ui::VKEY_RETURN) { |
78 command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE); | 78 command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE); |
79 return true; | 79 return true; |
80 } | 80 } |
81 return false; | 81 return false; |
82 } | 82 } |
OLD | NEW |