[iOS] Fixes context menu style

This CL fixes some style issue related to context menu.

Bug: 1093302
Change-Id: I53966504a431b9545c4d79ebaf6bbbdfdda77d88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2325615
Commit-Queue: Ewann Pellé <ewannpv@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Sebastien Lalancette <seblalancette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792759}

ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm

@@ -2182,14 +2182,14 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
   if (node->is_url()) {
     actionProvider = ^(NSArray<UIMenuElement*>* suggestedActions) {
       // Record that this context menu was shown to the user.
-      RecordMenuShown(MenuScenario::BookmarkEntry);
+      RecordMenuShown(MenuScenario::kBookmarkEntry);
 
       ActionFactory* actionFactory =
-          [[ActionFactory alloc] initWithScenario:MenuScenario::BookmarkEntry];
+          [[ActionFactory alloc] initWithScenario:MenuScenario::kBookmarkEntry];
 
       UIAction* copyAction = [actionFactory actionToCopyURL:node->url()];
 
-      return [UIMenu menuWithTitle:[NSString string] children:@[ copyAction ]];
+      return [UIMenu menuWithTitle:@"" children:@[ copyAction ]];
     };
   }
 

ios/chrome/browser/ui/history/history_coordinator.mm

@@ -175,9 +175,9 @@
 
 #pragma mark - HistoryMenuProvider
 
-- (UIContextMenuConfiguration*)createConfigurationForItem:
+- (UIContextMenuConfiguration*)contextMenuConfigurationForItem:
                                    (HistoryEntryItem*)item
-                                                 withView:(UIView*)view
+                                                      withView:(UIView*)view
     API_AVAILABLE(ios(13.0)) {
   __weak id<HistoryEntryItemDelegate> historyItemDelegate =
       self.historyTableViewController;
@@ -185,10 +185,10 @@
   UIContextMenuActionProvider actionProvider =
       ^(NSArray<UIMenuElement*>* suggestedActions) {
         // Record that this context menu was shown to the user.
-        RecordMenuShown(MenuScenario::HistoryEntry);
+        RecordMenuShown(MenuScenario::kHistoryEntry);
 
-        ActionFactory* actionFactory =
-            [[ActionFactory alloc] initWithScenario:MenuScenario::HistoryEntry];
+        ActionFactory* actionFactory = [[ActionFactory alloc]
+            initWithScenario:MenuScenario::kHistoryEntry];
 
         UIAction* copyAction = [actionFactory actionToCopyURL:item.URL];
 
@@ -196,7 +196,7 @@
           [historyItemDelegate historyEntryItemDidRequestDelete:item];
         }];
 
-        return [UIMenu menuWithTitle:[NSString string]
+        return [UIMenu menuWithTitle:@""
                             children:@[ copyAction, deleteAction ]];
       };
 

ios/chrome/browser/ui/history/history_menu_provider.h

@@ -7,14 +7,14 @@
 
 #import "ios/chrome/browser/ui/history/history_entry_item.h"
 
-// Protocol for instances that will provide menus to history components.
+// Protocol for instances that will provide menus to History components.
 @protocol HistoryMenuProvider
 
 // Creates a context menu configuration instance for the given |item|, which is
 // represented on the UI by |view|.
-- (UIContextMenuConfiguration*)createConfigurationForItem:
+- (UIContextMenuConfiguration*)contextMenuConfigurationForItem:
                                    (HistoryEntryItem*)item
-                                                 withView:(UIView*)view
+                                                      withView:(UIView*)view
     API_AVAILABLE(ios(13.0));
 
 @end

ios/chrome/browser/ui/history/history_table_view_controller.mm

@@ -628,7 +628,8 @@ const CGFloat kButtonHorizontalPadding = 30.0;
   HistoryEntryItem* entry = base::mac::ObjCCastStrict<HistoryEntryItem>(
       [self.tableViewModel itemAtIndexPath:indexPath]);
   UIView* cell = [self.tableView cellForRowAtIndexPath:indexPath];
-  return [self.menuProvider createConfigurationForItem:entry withView:cell];
+  return [self.menuProvider contextMenuConfigurationForItem:entry
+                                                   withView:cell];
 }
 
 #pragma mark - UITableViewDataSource

ios/chrome/browser/ui/menu/action_factory_unittest.mm

@@ -27,7 +27,7 @@
 #if defined(__IPHONE_13_0)
 
 namespace {
-MenuScenario kTestMenuScenario = MenuScenario::HistoryEntry;
+MenuScenario kTestMenuScenario = MenuScenario::kHistoryEntry;
 }  // namespace
 
 // Test fixture for the ActionFactory.

ios/chrome/browser/ui/menu/menu_histograms.h

@@ -9,9 +9,9 @@
 // not be renumbered. Please keep in sync with "IOSMenuScenario" in
 // src/tools/metrics/histograms/enums.xml.
 enum class MenuScenario {
-  HistoryEntry = 0,
-  BookmarkEntry = 1,
-  kMaxValue = BookmarkEntry
+  kHistoryEntry = 0,
+  kBookmarkEntry = 1,
+  kMaxValue = kBookmarkEntry
 };
 
 // Records a menu shown histogram metric for the |scenario|.

ios/chrome/browser/ui/menu/menu_histograms.mm

@@ -27,9 +27,9 @@ void RecordMenuShown(MenuScenario scenario) {
 
 const char* GetActionsHistogramName(MenuScenario scenario) {
   switch (scenario) {
-    case MenuScenario::HistoryEntry:
+    case MenuScenario::kHistoryEntry:
       return kHistoryEntryActionsHistogram;
-    case MenuScenario::BookmarkEntry:
+    case MenuScenario::kBookmarkEntry:
       return kBookmarkEntryActionsHistogram;
   }
 }