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

Unified Diff: ios/chrome/browser/ui/tools_menu/tools_menu_view_tools_cell.mm

Issue 2968973002: [ios] Removes IDC_BOOKMARK_PAGE and IDC_SHARE_PAGE
Patch Set: Rebased Created 3 years, 5 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
Index: ios/chrome/browser/ui/tools_menu/tools_menu_view_tools_cell.mm
diff --git a/ios/chrome/browser/ui/tools_menu/tools_menu_view_tools_cell.mm b/ios/chrome/browser/ui/tools_menu/tools_menu_view_tools_cell.mm
index 76f2f4104391873cbd37dc3f9aa9e878c595db27..86a8c807d08d846d2eb6e5a361ce52a4c32f9a30 100644
--- a/ios/chrome/browser/ui/tools_menu/tools_menu_view_tools_cell.mm
+++ b/ios/chrome/browser/ui/tools_menu/tools_menu_view_tools_cell.mm
@@ -12,12 +12,6 @@
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#include "ios/chrome/grit/ios_strings.h"
-// TODO(crbug.com/228521): Remove this once the new command/metric handling is
-// implemented. This is a temporary workaround to allow metrics recording to
-// distinguish the action. The value used is in the dynamic range (<
-// IDC_MinimumLabelValue) to avoid collisions.
-#define IDC_TEMP_EDIT_BOOKMARK 3900
-
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
@@ -53,13 +47,13 @@
int star[2][3] = TOOLBAR_IDR_TWO_STATE(STAR);
_starButton = [self newButtonForImageIds:star
- commandID:IDC_BOOKMARK_PAGE
+ commandID:TOOLS_BOOKMARK_ITEM
accessibilityLabelID:IDS_BOOKMARK_ADD_EDITOR_TITLE
automationName:@"Add Bookmark"];
int star_pressed[2][3] = TOOLBAR_IDR_ONE_STATE(STAR_PRESSED);
_starredButton = [self newButtonForImageIds:star_pressed
- commandID:IDC_TEMP_EDIT_BOOKMARK
+ commandID:TOOLS_BOOKMARK_EDIT
accessibilityLabelID:IDS_IOS_TOOLS_MENU_EDIT_BOOKMARK
automationName:@"Edit Bookmark"];
@@ -78,7 +72,7 @@
int share[2][3] = TOOLBAR_IDR_THREE_STATE(SHARE);
_shareButton = [self newButtonForImageIds:share
- commandID:IDC_SHARE_PAGE
+ commandID:TOOLS_SHARE_ITEM
accessibilityLabelID:IDS_IOS_TOOLS_MENU_SHARE
automationName:@"Stop"];
int tools[2][3] = TOOLBAR_IDR_ONE_STATE(TOOLS_PRESSED);

Powered by Google App Engine
This is Rietveld 408576698