[ios] Removes Reading List and Reading mode IDC commands.

This CL Removes the use of the following commands and uses the dispatcher
instead:
IDC_READER_MODE
IDC_SHOW_READING_LIST


Bug: 738881
Change-Id: I72e1dd2add7905e3168daca502084c53a42fa4c8
Reviewed-on: https://chromium-review.googlesource.com/596530
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491093}

ios/chrome/browser/content_suggestions/content_suggestions_coordinator.mm

@@ -184,9 +184,7 @@ const char kNTPHelpURL[] = "https://support.google.com/chrome/?p=new_tab";
 #pragma mark - ContentSuggestionsCommands
 
 - (void)openReadingList {
-  [self.suggestionsViewController
-      chromeExecuteCommand:[GenericChromeCommand
-                               commandWithTag:IDC_SHOW_READING_LIST]];
+  [self.dispatcher showReadingList];
 }
 
 - (void)openPageForItem:(CollectionViewItem*)item {

ios/chrome/browser/ui/browser_view_controller.mm

@@ -4101,6 +4101,19 @@ applicationCommandEndpoint:(id<ApplicationCommands>)applicationCommandEndpoint {
   [_toolbarController dismissTabHistoryPopup];
 }
 
+- (void)showReadingList {
+  _readingListCoordinator = [[ReadingListCoordinator alloc]
+      initWithBaseViewController:self
+                    browserState:self.browserState
+                          loader:self];
+
+  [_readingListCoordinator start];
+}
+
+- (void)switchToReaderMode {
+  [[_model currentTab] switchToReaderMode];
+}
+
 #pragma mark - Command Handling
 
 - (IBAction)chromeExecuteCommand:(id)sender {
@@ -4150,9 +4163,6 @@ applicationCommandEndpoint:(id<ApplicationCommands>)applicationCommandEndpoint {
     case IDC_SHOW_MAIL_COMPOSER:
       [self showMailComposer:sender];
       break;
-    case IDC_READER_MODE:
-      [[_model currentTab] switchToReaderMode];
-      break;
     case IDC_REQUEST_DESKTOP_SITE:
       [[_model currentTab] reloadWithUserAgentType:web::UserAgentType::DESKTOP];
       break;
@@ -4202,9 +4212,6 @@ applicationCommandEndpoint:(id<ApplicationCommands>)applicationCommandEndpoint {
     case IDC_RATE_THIS_APP:
       [self showRateThisAppDialog];
       break;
-    case IDC_SHOW_READING_LIST:
-      [self showReadingList];
-      break;
     case IDC_VOICE_SEARCH: {
       // If the voice search command is coming from a UIView sender, store it
       // before sending the command up the responder chain.
@@ -4432,15 +4439,6 @@ applicationCommandEndpoint:(id<ApplicationCommands>)applicationCommandEndpoint {
   [tab navigationManager]->LoadURLWithParams(params);
 }
 
-- (void)showReadingList {
-  _readingListCoordinator = [[ReadingListCoordinator alloc]
-      initWithBaseViewController:self
-                    browserState:self.browserState
-                          loader:self];
-
-  [_readingListCoordinator start];
-}
-
 - (void)showNTPPanel:(NewTabPage::PanelIdentifier)panel {
   DCHECK(self.visible || self.dismissingModal);
   GURL url(kChromeUINewTabURL);

ios/chrome/browser/ui/commands/browser_commands.h

@@ -62,6 +62,13 @@ class NavigationItem;
 // Navigate back/forward to the selected entry in the tab's history.
 - (void)navigateToHistoryItem:(const web::NavigationItem*)item;
 
+// Shows the Reading List UI.
+- (void)showReadingList;
+
+// Asks the active tab to enter into reader mode, presenting a streamlined view
+// of the current content.
+- (void)switchToReaderMode;
+
 @end
 
 #endif  // IOS_CHROME_BROWSER_UI_COMMANDS_BROWSER_COMMANDS_H_

ios/chrome/browser/ui/commands/ios_command_ids.h

@@ -44,9 +44,7 @@
 #define IDC_PRELOAD_VOICE_SEARCH                       40937
 #define IDC_CLOSE_SETTINGS                             40944
 #define IDC_SHOW_SAVE_PASSWORDS_SETTINGS               40945
-#define IDC_READER_MODE                                40947
 #define IDC_RATE_THIS_APP                              40948
-#define IDC_SHOW_READING_LIST                          40950
 #define IDC_SHOW_CLEAR_BROWSING_DATA_SETTINGS          40951
 #define IDC_SHOW_SYNC_PASSPHRASE_SETTINGS              40952
 #define IDC_SHOW_AUTOFILL_SETTINGS                     40956

ios/chrome/browser/ui/reading_list/reading_list_egtest.mm

@@ -195,9 +195,7 @@ void AssertHeaderNotVisible(std::string header) {
 
 // Opens the reading list menu using command line.
 void OpenReadingList() {
-  GenericChromeCommand* command =
-      [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_READING_LIST];
-  chrome_test_util::RunCommandWithActiveViewController(command);
+  [chrome_test_util::BrowserCommandDispatcherForMainBVC() showReadingList];
 }
 
 // Adds a read and an unread entry to the model, opens the reading list menu and

ios/chrome/browser/ui/tools_menu/tools_menu_constants.h

@@ -50,6 +50,8 @@ typedef NS_ENUM(int, ToolsMenuItemID) {
   TOOLS_SETTINGS_ITEM = -7,
   TOOLS_NEW_TAB_ITEM = -8,
   TOOLS_NEW_INCOGNITO_TAB_ITEM = -9,
+  TOOLS_READING_LIST = -10,
+  TOOLS_READER_MODE = -11,
 };
 
 #endif  // IOS_CHROME_BROWSER_UI_TOOLS_MENU_TOOLS_MENU_CONSTANTS_H_

ios/chrome/browser/ui/tools_menu/tools_menu_model.mm

@@ -7,6 +7,7 @@
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #include "ios/chrome/browser/ui/commands/application_commands.h"
+#include "ios/chrome/browser/ui/commands/browser_commands.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/tools_menu/new_tab_menu_view_item.h"
 #import "ios/chrome/browser/ui/tools_menu/reading_list_menu_view_item.h"
@@ -53,7 +54,8 @@ const MenuItemInfo itemInfoList[kToolsMenuNumberOfItems] = {
     IDC_SHOW_BOOKMARK_MANAGER, nullptr,   ToolbarTypeWebAll,
     0,                                    nil },
   { IDS_IOS_TOOLS_MENU_READING_LIST,      kToolsMenuReadingListId,
-    IDC_SHOW_READING_LIST, nullptr,       ToolbarTypeWebAll,
+    TOOLS_READING_LIST,
+    @selector(showReadingList),           ToolbarTypeWebAll,
     0,                                    [ReadingListMenuViewItem class] },
   { IDS_IOS_TOOLS_MENU_RECENT_TABS,       kToolsMenuOtherDevicesId,
     IDC_SHOW_OTHER_DEVICES, nullptr,      ToolbarTypeWebAll,
@@ -76,7 +78,8 @@ const MenuItemInfo itemInfoList[kToolsMenuNumberOfItems] = {
     IDC_REQUEST_MOBILE_SITE, nullptr,     ToolbarTypeWebAll,
     0,                                    nil },
   { IDS_IOS_TOOLS_MENU_READER_MODE,       kToolsMenuReaderMode,
-    IDC_READER_MODE, nullptr,             ToolbarTypeWebAll,
+    TOOLS_READER_MODE,
+    @selector(switchToReaderMode),        ToolbarTypeWebAll,
     0,                                    nil },
   { IDS_IOS_TOOLS_MENU_SETTINGS,          kToolsMenuSettingsId,
     TOOLS_SETTINGS_ITEM,

ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm

@@ -197,7 +197,7 @@ NS_INLINE void AnimateInViews(NSArray* views,
 }
 
 - (void)setCanUseReaderMode:(BOOL)enabled {
-  [self setItemEnabled:enabled withTag:IDC_READER_MODE];
+  [self setItemEnabled:enabled withTag:TOOLS_READER_MODE];
 }
 
 - (void)setCanShowFindBar:(BOOL)enabled {

ios/chrome/browser/ui/tools_menu/tools_popup_controller.mm

@@ -203,7 +203,7 @@ NS_INLINE UIEdgeInsets TabHistoryPopupMenuInsets() {
     case IDC_REQUEST_MOBILE_SITE:
       base::RecordAction(UserMetricsAction("MobileMenuRequestMobileSite"));
       break;
-    case IDC_READER_MODE:
+    case TOOLS_READER_MODE:
       base::RecordAction(UserMetricsAction("MobileMenuRequestReaderMode"));
       break;
     case IDC_SHOW_BOOKMARK_MANAGER:
@@ -228,7 +228,7 @@ NS_INLINE UIEdgeInsets TabHistoryPopupMenuInsets() {
     case TOOLS_MENU_ITEM:
       // Do nothing when tapping the tools menu a second time.
       break;
-    case IDC_SHOW_READING_LIST:
+    case TOOLS_READING_LIST:
       base::RecordAction(UserMetricsAction("MobileMenuReadingList"));
       break;
     default: