From 3337a25f2c666c2812c991b0556d0a42b3a525c1 Mon Sep 17 00:00:00 2001
From: lpromero <lpromero@chromium.org>
Date: Fri, 5 May 2017 10:20:06 -0700
Subject: [PATCH] Re-hook Settings in CSChromium

BUG=none
R=sczs@chromium.org

Review-Url: https://codereview.chromium.org/2863753003
Cr-Commit-Position: refs/heads/master@{#469696}
---
 ios/clean/chrome/browser/ui/tools/BUILD.gn                | 2 +-
 ios/clean/chrome/browser/ui/tools/menu_view_controller.mm | 4 +---
 ios/clean/chrome/browser/ui/tools/tools_mediator.mm       | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ios/clean/chrome/browser/ui/tools/BUILD.gn b/ios/clean/chrome/browser/ui/tools/BUILD.gn
index d13cffd745987..d3cf5c2df279a 100644
--- a/ios/clean/chrome/browser/ui/tools/BUILD.gn
+++ b/ios/clean/chrome/browser/ui/tools/BUILD.gn
@@ -15,8 +15,8 @@ source_set("tools") {
   deps = [
     ":tools_ui",
     "//base",
-    "//ios/clean/chrome/browser/ui/actions",
     "//ios/clean/chrome/browser/ui/animators",
+    "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/presenters",
     "//ios/shared/chrome/browser/ui/browser_list",
     "//ios/shared/chrome/browser/ui/coordinators",
diff --git a/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm b/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
index cbe9f767c2215..5cbc58075070b 100644
--- a/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
+++ b/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
@@ -69,9 +69,7 @@ - (void)viewDidLoad {
                    action:@selector(closeToolsMenu)
          forControlEvents:UIControlEventTouchUpInside];
     if (item.action) {
-      id target =
-          (item.action == @selector(showFindInPage)) ? self.dispatcher : nil;
-      [menuButton addTarget:target
+      [menuButton addTarget:self.dispatcher
                      action:item.action
            forControlEvents:UIControlEventTouchUpInside];
     }
diff --git a/ios/clean/chrome/browser/ui/tools/tools_mediator.mm b/ios/clean/chrome/browser/ui/tools/tools_mediator.mm
index a7e17da302e19..f943a4b2c4d5c 100644
--- a/ios/clean/chrome/browser/ui/tools/tools_mediator.mm
+++ b/ios/clean/chrome/browser/ui/tools/tools_mediator.mm
@@ -4,7 +4,7 @@
 
 #import "ios/clean/chrome/browser/ui/tools/tools_mediator.h"
 
-#import "ios/clean/chrome/browser/ui/actions/settings_actions.h"
+#import "ios/clean/chrome/browser/ui/commands/settings_commands.h"
 #import "ios/clean/chrome/browser/ui/tools/tools_actions.h"
 #import "ios/clean/chrome/browser/ui/tools/tools_consumer.h"
 #import "ios/clean/chrome/browser/ui/tools/tools_menu_item.h"
@@ -68,7 +68,7 @@ - (void)setConsumer:(id<ToolsConsumer>)consumer {
   menuItems[8].title = @"Request Desktop Site";
 
   menuItems[9].title = @"Settings";
-  menuItems[9].action = @selector(showSettings:);
+  menuItems[9].action = @selector(showSettings);
 
   menuItems[10].title = @"Help";