| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/renderer_context_menu/render_view_context_menu
_views.h" | 5 #include "chrome/browser/ui/views/renderer_context_menu/render_view_context_menu
_views.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 83 |
| 84 case IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE: | 84 case IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE: |
| 85 *accel = ui::Accelerator(ui::VKEY_V, | 85 *accel = ui::Accelerator(ui::VKEY_V, |
| 86 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); | 86 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); |
| 87 return true; | 87 return true; |
| 88 | 88 |
| 89 case IDC_CONTENT_CONTEXT_SELECTALL: | 89 case IDC_CONTENT_CONTEXT_SELECTALL: |
| 90 *accel = ui::Accelerator(ui::VKEY_A, ui::EF_CONTROL_DOWN); | 90 *accel = ui::Accelerator(ui::VKEY_A, ui::EF_CONTROL_DOWN); |
| 91 return true; | 91 return true; |
| 92 | 92 |
| 93 case IDC_CONTENT_CONTEXT_ROTATECCW: |
| 94 *accel = ui::Accelerator(ui::VKEY_OEM_4, ui::EF_CONTROL_DOWN); |
| 95 return true; |
| 96 |
| 97 case IDC_CONTENT_CONTEXT_ROTATECW: |
| 98 *accel = ui::Accelerator(ui::VKEY_OEM_6, ui::EF_CONTROL_DOWN); |
| 99 return true; |
| 100 |
| 93 default: | 101 default: |
| 94 return false; | 102 return false; |
| 95 } | 103 } |
| 96 } | 104 } |
| 97 | 105 |
| 98 void RenderViewContextMenuViews::ExecuteCommand(int command_id, | 106 void RenderViewContextMenuViews::ExecuteCommand(int command_id, |
| 99 int event_flags) { | 107 int event_flags) { |
| 100 switch (command_id) { | 108 switch (command_id) { |
| 101 case IDC_WRITING_DIRECTION_DEFAULT: | 109 case IDC_WRITING_DIRECTION_DEFAULT: |
| 102 // WebKit's current behavior is for this menu item to always be disabled. | 110 // WebKit's current behavior is for this menu item to always be disabled. |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 WebContents::FromRenderFrameHost(GetRenderFrameHost()); | 217 WebContents::FromRenderFrameHost(GetRenderFrameHost()); |
| 210 if (!web_contents) { | 218 if (!web_contents) { |
| 211 LOG(ERROR) << "RenderViewContextMenuViews::Show, couldn't find WebContents"; | 219 LOG(ERROR) << "RenderViewContextMenuViews::Show, couldn't find WebContents"; |
| 212 return NULL; | 220 return NULL; |
| 213 } | 221 } |
| 214 return web_contents->GetFullscreenRenderWidgetHostView() | 222 return web_contents->GetFullscreenRenderWidgetHostView() |
| 215 ? web_contents->GetFullscreenRenderWidgetHostView() | 223 ? web_contents->GetFullscreenRenderWidgetHostView() |
| 216 ->GetNativeView() | 224 ->GetNativeView() |
| 217 : web_contents->GetNativeView(); | 225 : web_contents->GetNativeView(); |
| 218 } | 226 } |
| OLD | NEW |