Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Unified Diff: chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc

Issue 83163002: [Aura] Adding Writing direction to the context menu for Aura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Aura-CrOS-Win Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
index 19294bacc477e2bc632e3947051c3a1a2cacb11b..f4df38168214bcbbfba1f71f6ecc9c8ced2a8089 100644
--- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
+++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
@@ -17,6 +17,11 @@
#include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/menu_runner.h"
+#if !defined(OS_WIN)
Peter Kasting 2013/12/03 22:52:35 These #includes should not be ifdefed.
pals 2013/12/04 12:54:50 Done.
+#include "content/public/browser/render_view_host.h"
+#include "ui/base/l10n/l10n_util.h"
+#endif // !OS_WIN
+
using content::WebContents;
////////////////////////////////////////////////////////////////////////////////
@@ -25,7 +30,8 @@ using content::WebContents;
RenderViewContextMenuViews::RenderViewContextMenuViews(
WebContents* web_contents,
const content::ContextMenuParams& params)
- : RenderViewContextMenu(web_contents, params) {
+ : RenderViewContextMenu(web_contents, params),
+ bidi_submenu_model_(this) {
}
RenderViewContextMenuViews::~RenderViewContextMenuViews() {
@@ -109,6 +115,87 @@ bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
}
}
+void RenderViewContextMenuViews::ExecuteCommand(int command_id,
+ int event_flags) {
Peter Kasting 2013/12/03 22:52:35 Nit: Indent even
pals 2013/12/04 12:54:50 Done.
+ switch (command_id) {
+ case IDC_WRITING_DIRECTION_DEFAULT:
+ // WebKit's current behavior is for this menu item to always be disabled.
Peter Kasting 2013/12/03 22:52:35 Then why are we displaying it in the menu? Or wil
pals 2013/12/04 12:54:50 I think default is for dir="auto". see crbug.com/3
Peter Kasting 2013/12/04 19:46:31 Right, I'd also think it corresponds to dir=auto.
pals 2013/12/05 14:25:49 I found original implementaion on OSX (webkit side
jeremy 2013/12/05 14:33:18 If I had to guess, I'd think this is a "match-the-
+ NOTREACHED();
+ break;
+
+ case IDC_WRITING_DIRECTION_RTL:
+ case IDC_WRITING_DIRECTION_LTR: {
+ content::RenderViewHost* view_host = GetRenderViewHost();
+ view_host->UpdateTextDirection((command_id == IDC_WRITING_DIRECTION_RTL) ?
+ blink::WebTextDirectionRightToLeft :
+ blink::WebTextDirectionLeftToRight);
+ view_host->NotifyTextDirection();
+ break;
+ }
+
+ default:
+ RenderViewContextMenu::ExecuteCommand(command_id, event_flags);
+ break;
+ }
+}
+
+bool RenderViewContextMenuViews::IsCommandIdChecked(int command_id) const {
+ switch (command_id) {
+ case IDC_WRITING_DIRECTION_DEFAULT:
+ return params_.writing_direction_default &
+ blink::WebContextMenuData::CheckableMenuItemChecked;
+ case IDC_WRITING_DIRECTION_RTL:
+ return params_.writing_direction_right_to_left &
+ blink::WebContextMenuData::CheckableMenuItemChecked;
+ case IDC_WRITING_DIRECTION_LTR:
+ return params_.writing_direction_left_to_right &
+ blink::WebContextMenuData::CheckableMenuItemChecked;
+
+ default:
+ return RenderViewContextMenu::IsCommandIdChecked(command_id);
+ }
+}
+
+bool RenderViewContextMenuViews::IsCommandIdEnabled(int command_id) const {
+ switch (command_id) {
+ case IDC_WRITING_DIRECTION_MENU:
+ return true;
+ case IDC_WRITING_DIRECTION_DEFAULT: // Provided to match OS defaults.
+ return params_.writing_direction_default &
+ blink::WebContextMenuData::CheckableMenuItemEnabled;
+ case IDC_WRITING_DIRECTION_RTL:
+ return params_.writing_direction_right_to_left &
+ blink::WebContextMenuData::CheckableMenuItemEnabled;
+ case IDC_WRITING_DIRECTION_LTR:
+ return params_.writing_direction_left_to_right &
+ blink::WebContextMenuData::CheckableMenuItemEnabled;
+
+ default:
+ return RenderViewContextMenu::IsCommandIdEnabled(command_id);
+ }
+}
+
+void RenderViewContextMenuViews::AppendPlatformEditableItems() {
+ // OS X and Linux provide a contextual menu to set writing direction for BiDi
+ // languages.
+ // This functionality is exposed as a keyboard shortcut on Windows.
Peter Kasting 2013/12/03 22:52:35 This comment seems out of date.
pals 2013/12/04 12:54:50 Done.
+ AppendBidiSubMenu();
Peter Kasting 2013/12/03 22:52:35 Why a separate function for this instead of just d
pals 2013/12/04 12:54:50 Done.
+}
+
+void RenderViewContextMenuViews::AppendBidiSubMenu() {
+ bidi_submenu_model_.AddCheckItem(IDC_WRITING_DIRECTION_DEFAULT,
Peter Kasting 2013/12/03 22:52:35 Nit: Wrap after '(' so all lines of args are align
pals 2013/12/04 12:54:50 Done.
+ l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_WRITING_DIRECTION_DEFAULT));
+ bidi_submenu_model_.AddCheckItem(IDC_WRITING_DIRECTION_LTR,
+ l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_WRITING_DIRECTION_LTR));
+ bidi_submenu_model_.AddCheckItem(IDC_WRITING_DIRECTION_RTL,
+ l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_WRITING_DIRECTION_RTL));
+
+ menu_model_.AddSubMenu(
+ IDC_WRITING_DIRECTION_MENU,
+ l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_WRITING_DIRECTION_MENU),
+ &bidi_submenu_model_);
+}
+
void RenderViewContextMenuViews::UpdateMenuItem(int command_id,
bool enabled,
bool hidden,

Powered by Google App Engine
This is Rietveld 408576698