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

Unified Diff: ui/views_content_client/views_content_client_main_parts_mac.mm

Issue 782673002: MacViews: tryjobs for toolkit_views=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: latest crrev/901823002 Created 5 years, 10 months 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
« no previous file with comments | « ui/views/widget/widget_interactive_uitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views_content_client/views_content_client_main_parts_mac.mm
diff --git a/ui/views_content_client/views_content_client_main_parts_mac.mm b/ui/views_content_client/views_content_client_main_parts_mac.mm
index 5fc62f32bd47e17296cf10f32e423ab5916f2b92..392cd759a8aa26dd9e68e9c2dde1e62455e648dc 100644
--- a/ui/views_content_client/views_content_client_main_parts_mac.mm
+++ b/ui/views_content_client/views_content_client_main_parts_mac.mm
@@ -104,7 +104,9 @@ ViewsContentClientMainParts* ViewsContentClientMainParts::Create(
// Create a basic mainMenu object using the executable filename.
base::scoped_nsobject<NSMenu> mainMenu([[NSMenu alloc] initWithTitle:@""]);
NSMenuItem* appMenuItem =
- [mainMenu addItemWithTitle:@"" action:NULL keyEquivalent:@""];
+ [mainMenu addItemWithTitle:@"" action:nullptr keyEquivalent:@""];
+ NSMenuItem* editMenuItem =
+ [mainMenu addItemWithTitle:@"" action:nullptr keyEquivalent:@""];
[NSApp setMainMenu:mainMenu];
base::scoped_nsobject<NSMenu> appMenu([[NSMenu alloc] initWithTitle:@""]);
@@ -117,6 +119,28 @@ ViewsContentClientMainParts* ViewsContentClientMainParts::Create(
keyEquivalent:@"q"];
[appMenuItem setSubmenu:appMenu];
+ base::scoped_nsobject<NSMenu> editMenu(
+ [[NSMenu alloc] initWithTitle:@"Edit"]);
+ struct {
+ NSString* title;
+ SEL action;
+ NSString* key_equivalent;
+ } edit_menu_item[] = {
+ { @"Undo", @selector(undo:), @"z" },
+ { @"Redo", @selector(redo:), @"Z" },
+ { @"Copy", @selector(copy:), @"c" },
+ { @"Cut", @selector(cut:), @"x" },
+ { @"Paste", @selector(paste:), @"v" },
+ { @"Select All", @selector(selectAll:), @"a" },
+ };
+ for (size_t i = 0; i < arraysize(edit_menu_item); ++i) {
+ [editMenu insertItemWithTitle:edit_menu_item[i].title
+ action:edit_menu_item[i].action
+ keyEquivalent:edit_menu_item[i].key_equivalent
+ atIndex:i];
+ }
+ [editMenuItem setSubmenu:editMenu];
+
task_.Run();
}
« no previous file with comments | « ui/views/widget/widget_interactive_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698