| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
| index 2e9d8aeb2133f4fe305caba864af68e2965346a6..56b9b34c6eab635dafcfb517e0a305c9a2e605a6 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -457,7 +457,7 @@ bool BrowserView::ShouldShowAvatar() const {
|
| return AvatarMenuModel::ShouldShowAvatarMenu();
|
| }
|
|
|
| -bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
|
| +bool BrowserView::AcceleratorPressed(const ui::Accelerator& accelerator) {
|
| #if defined(OS_CHROMEOS)
|
| // If accessibility is enabled, stop speech and return false so that key
|
| // combinations involving Search can be used for extra accessibility
|
| @@ -470,7 +470,7 @@ bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
|
| }
|
| #endif
|
|
|
| - std::map<views::Accelerator, int>::const_iterator iter =
|
| + std::map<ui::Accelerator, int>::const_iterator iter =
|
| accelerator_table_.find(accelerator);
|
| DCHECK(iter != accelerator_table_.end());
|
| int command_id = iter->second;
|
| @@ -485,18 +485,17 @@ bool BrowserView::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
|
| // anywhere so we need to check for them explicitly here.
|
| switch (cmd_id) {
|
| case IDC_CUT:
|
| - *accelerator = views::Accelerator(ui::VKEY_X, false, true, false);
|
| + *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false);
|
| return true;
|
| case IDC_COPY:
|
| - *accelerator = views::Accelerator(ui::VKEY_C, false, true, false);
|
| + *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false);
|
| return true;
|
| case IDC_PASTE:
|
| - *accelerator = views::Accelerator(ui::VKEY_V, false, true, false);
|
| + *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false);
|
| return true;
|
| }
|
| // Else, we retrieve the accelerator information from the accelerator table.
|
| - std::map<views::Accelerator, int>::iterator it =
|
| - accelerator_table_.begin();
|
| + std::map<ui::Accelerator, int>::iterator it = accelerator_table_.begin();
|
| for (; it != accelerator_table_.end(); ++it) {
|
| if (it->second == cmd_id) {
|
| *accelerator = it->first;
|
| @@ -2460,7 +2459,7 @@ void BrowserView::InitHangMonitor() {
|
| }
|
|
|
| void BrowserView::UpdateAcceleratorMetrics(
|
| - const views::Accelerator& accelerator, int command_id) {
|
| + const ui::Accelerator& accelerator, int command_id) {
|
| const ui::KeyboardCode key_code = accelerator.key_code();
|
| if (command_id == IDC_HELP_PAGE && key_code == ui::VKEY_F1)
|
| UserMetrics::RecordAction(UserMetricsAction("ShowHelpTabViaF1"));
|
|
|