| 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" |
| 11 #include "chrome/browser/ui/views/browser_dialogs.h" | 11 #include "chrome/browser/ui/views/browser_dialogs.h" |
| 12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 13 #include "grit/generated_resources.h" | 13 #include "grit/generated_resources.h" |
| 14 #include "grit/theme_resources.h" | 14 #include "grit/theme_resources.h" |
| 15 #include "ui/base/accessibility/accessible_view_state.h" | 15 #include "ui/base/accessibility/accessible_view_state.h" |
| 16 #include "ui/base/event.h" |
| 16 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
| 17 #include "ui/base/resource/resource_bundle.h" | 18 #include "ui/base/resource/resource_bundle.h" |
| 18 | 19 |
| 19 ChromeToMobileView::ChromeToMobileView( | 20 ChromeToMobileView::ChromeToMobileView( |
| 20 LocationBarView* location_bar_view, | 21 LocationBarView* location_bar_view, |
| 21 CommandUpdater* command_updater) | 22 CommandUpdater* command_updater) |
| 22 : location_bar_view_(location_bar_view), | 23 : location_bar_view_(location_bar_view), |
| 23 command_updater_(command_updater) { | 24 command_updater_(command_updater) { |
| 24 set_id(VIEW_ID_CHROME_TO_MOBILE_BUTTON); | 25 set_id(VIEW_ID_CHROME_TO_MOBILE_BUTTON); |
| 25 set_accessibility_focusable(true); | 26 set_accessibility_focusable(true); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 bool ChromeToMobileView::OnMousePressed(const views::MouseEvent& event) { | 66 bool ChromeToMobileView::OnMousePressed(const views::MouseEvent& event) { |
| 66 // Show the bubble on mouse release; that is standard button behavior. | 67 // Show the bubble on mouse release; that is standard button behavior. |
| 67 return true; | 68 return true; |
| 68 } | 69 } |
| 69 | 70 |
| 70 void ChromeToMobileView::OnMouseReleased(const views::MouseEvent& event) { | 71 void ChromeToMobileView::OnMouseReleased(const views::MouseEvent& event) { |
| 71 if (event.IsOnlyLeftMouseButton() && HitTest(event.location())) | 72 if (event.IsOnlyLeftMouseButton() && HitTest(event.location())) |
| 72 command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE); | 73 command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE); |
| 73 } | 74 } |
| 74 | 75 |
| 75 bool ChromeToMobileView::OnKeyPressed(const views::KeyEvent& event) { | 76 bool ChromeToMobileView::OnKeyPressed(const ui::KeyEvent& event) { |
| 76 if (event.key_code() == ui::VKEY_SPACE || | 77 if (event.key_code() == ui::VKEY_SPACE || |
| 77 event.key_code() == ui::VKEY_RETURN) { | 78 event.key_code() == ui::VKEY_RETURN) { |
| 78 command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE); | 79 command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE); |
| 79 return true; | 80 return true; |
| 80 } | 81 } |
| 81 return false; | 82 return false; |
| 82 } | 83 } |
| OLD | NEW |