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

Unified Diff: ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.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_controller.mm
diff --git a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
index 3928cfaaeef81e1aa96e549d6a4b1edf3b9ed995..f66c14459d12d4cd841371cdd32d72e91704ab42 100644
--- a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
+++ b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
@@ -194,7 +194,6 @@ NS_INLINE void AnimateInViews(NSArray* views,
- (void)setCanShowShareMenu:(BOOL)enabled {
ToolsMenuViewToolsCell* toolsCell = [self toolsCell];
[[toolsCell shareButton] setEnabled:enabled];
- [self setItemEnabled:enabled withTag:IDC_SHARE_PAGE];
}
- (UIButton*)toolsButton {
@@ -473,6 +472,12 @@ NS_INLINE void AnimateInViews(NSArray* views,
[toolsCell.reloadButton removeTarget:self.dispatcher
action:@selector(reload)
forControlEvents:UIControlEventTouchUpInside];
+ [toolsCell.starButton removeTarget:self.dispatcher
+ action:@selector(bookmarkPage)
+ forControlEvents:UIControlEventTouchUpInside];
+ [toolsCell.starredButton removeTarget:self.dispatcher
+ action:@selector(bookmarkPage)
+ forControlEvents:UIControlEventTouchUpInside];
}
#pragma mark - Button event handling
@@ -484,16 +489,12 @@ NS_INLINE void AnimateInViews(NSArray* views,
// to the real command for the dispatch. This is very hacky, but it will go
// away soon. See crbug/228521
DCHECK([sender respondsToSelector:@selector(setTag:)]);
- if (commandId == IDC_TEMP_EDIT_BOOKMARK)
- [sender setTag:IDC_BOOKMARK_PAGE];
// Do nothing when tapping the tools menu a second time.
// Do not use -chromeExecuteCommand: for tags < 0 -- that is, items that have
// been refactored to use the dispatcher.
if (commandId != IDC_SHOW_TOOLS_MENU && commandId > 0) {
[self chromeExecuteCommand:sender];
}
- if (commandId == IDC_TEMP_EDIT_BOOKMARK)
- [sender setTag:IDC_TEMP_EDIT_BOOKMARK];
// Do any metrics logging for the command, and then close the menu.
[_delegate commandWasSelected:commandId];
@@ -598,6 +599,12 @@ NS_INLINE void AnimateInViews(NSArray* views,
[cell.reloadButton addTarget:self.dispatcher
action:@selector(reload)
forControlEvents:UIControlEventTouchUpInside];
+ [cell.starButton addTarget:self.dispatcher
+ action:@selector(bookmarkPage)
+ forControlEvents:UIControlEventTouchUpInside];
+ [cell.starredButton addTarget:self.dispatcher
+ action:@selector(bookmarkPage)
+ forControlEvents:UIControlEventTouchUpInside];
for (UIButton* button in [cell allButtons]) {
[button addTarget:self
action:@selector(buttonPressed:)

Powered by Google App Engine
This is Rietveld 408576698