Use PanelIndentifier instead of Integer for NTPBar

The NewTabPageBarItem was using a NSInteger to store a PanelIdentifier
value. Use directly the enum to avoid conversions.

Bug: 753391
Change-Id: I74e319db566cdb65e93a83b09d1d923b7b446c6f
Reviewed-on: https://chromium-review.googlesource.com/645958Reviewed-by: Mark Cogan <marq@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#499497}

ios/chrome/browser/ui/ntp/BUILD.gn

@@ -172,6 +172,7 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_util",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/context_menu",
@@ -244,6 +245,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/test:test_support",

ios/chrome/browser/ui/ntp/new_tab_page_bar_item.h

@@ -8,17 +8,20 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+#import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
+
 // Represents an item on the new tab page bar, similar to a UITabBarItem.
 @interface NewTabPageBarItem : NSObject
 
 // Convenience method for creating a tab bar choice.
 + (NewTabPageBarItem*)newTabPageBarItemWithTitle:(NSString*)title
-                                      identifier:(NSUInteger)identifier
+                                      identifier:
+                                          (ntp_home::PanelIdentifier)identifier
                                            image:(UIImage*)imageName
     NS_RETURNS_NOT_RETAINED;
 
 @property(nonatomic, copy) NSString* title;
-@property(nonatomic, assign) NSUInteger identifier;
+@property(nonatomic, assign) ntp_home::PanelIdentifier identifier;
 @property(nonatomic, strong) UIImage* image;
 @property(nonatomic, weak) UIView* view;
 @end

ios/chrome/browser/ui/ntp/new_tab_page_bar_item.mm

@@ -15,7 +15,8 @@
 @synthesize view = view_;
 
 + (NewTabPageBarItem*)newTabPageBarItemWithTitle:(NSString*)title
-                                      identifier:(NSUInteger)identifier
+                                      identifier:
+                                          (ntp_home::PanelIdentifier)identifier
                                            image:(UIImage*)image {
   NewTabPageBarItem* item = [[NewTabPageBarItem alloc] init];
   if (item) {

ios/chrome/browser/ui/ntp/new_tab_page_bar_unittest.mm

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/ntp/new_tab_page_bar.h"
+#import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_bar_item.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -32,19 +33,19 @@ class NewTabPageBarTest : public PlatformTest {
 
 TEST_F(NewTabPageBarTest, SetItems) {
   NewTabPageBarItem* firstItem = [NewTabPageBarItem
-      newTabPageBarItemWithTitle:@"First"
-                      identifier:1
+      newTabPageBarItemWithTitle:@"Home"
+                      identifier:ntp_home::HOME_PANEL
                            image:[UIImage imageNamed:@"ntp_bookmarks"]];
   // Tests that identifier test function can return both true and false.
-  EXPECT_TRUE(firstItem.identifier == 1U);
+  EXPECT_TRUE(firstItem.identifier == ntp_home::HOME_PANEL);
 
   NewTabPageBarItem* secondItem = [NewTabPageBarItem
-      newTabPageBarItemWithTitle:@"Second"
-                      identifier:2
+      newTabPageBarItemWithTitle:@"Bookmarks"
+                      identifier:ntp_home::BOOKMARKS_PANEL
                            image:[UIImage imageNamed:@"ntp_bookmarks"]];
   NewTabPageBarItem* thirdItem = [NewTabPageBarItem
-      newTabPageBarItemWithTitle:@"Third"
-                      identifier:3
+      newTabPageBarItemWithTitle:@"RecentTabs"
+                      identifier:ntp_home::RECENT_TABS_PANEL
                            image:[UIImage imageNamed:@"ntp_bookmarks"]];
 
   [bar_ setItems:[NSArray arrayWithObject:firstItem]];
@@ -65,17 +66,16 @@ TEST_F(NewTabPageBarTest, SetSelectedIndex_iPadOnly) {
   }
 
   NewTabPageBarItem* firstItem = [NewTabPageBarItem
-      newTabPageBarItemWithTitle:@"First"
-                      identifier:1
+      newTabPageBarItemWithTitle:@"Home"
+                      identifier:ntp_home::HOME_PANEL
                            image:[UIImage imageNamed:@"ntp_bookmarks"]];
   NewTabPageBarItem* secondItem = [NewTabPageBarItem
-      newTabPageBarItemWithTitle:@"Second"
-                      identifier:2
+      newTabPageBarItemWithTitle:@"Bookmarks"
+                      identifier:ntp_home::BOOKMARKS_PANEL
                            image:[UIImage imageNamed:@"ntp_bookmarks"]];
-
   NewTabPageBarItem* thirdItem = [NewTabPageBarItem
-      newTabPageBarItemWithTitle:@"Third"
-                      identifier:3
+      newTabPageBarItemWithTitle:@"RecentTabs"
+                      identifier:ntp_home::RECENT_TABS_PANEL
                            image:[UIImage imageNamed:@"ntp_bookmarks"]];
 
   [bar_ setItems:[NSArray

ios/chrome/browser/ui/ntp/new_tab_page_controller.mm

@@ -706,7 +706,7 @@ enum {
     NSUInteger index = self.ntpView.tabBar.selectedIndex;
     DCHECK(index != NSNotFound);
     NewTabPageBarItem* item = self.ntpView.tabBar.items[index];
-    return static_cast<ntp_home::PanelIdentifier>(item.identifier);
+    return item.identifier;
   }
   return ntp_home::HOME_PANEL;
 }

ios/clean/chrome/browser/ui/ntp/ntp_view_controller.mm

@@ -156,19 +156,17 @@
     return;
 
   NewTabPageBarItem* item = self.NTPView.tabBar.items[index];
-  if (item.identifier == ntp_home::BOOKMARKS_PANEL) {
-    self.selectedNTPPanel = ntp_home::BOOKMARKS_PANEL;
-    if (!self.bookmarksViewController)
-      [self.dispatcher showNTPBookmarksPanel];
-  } else if (item.identifier == ntp_home::HOME_PANEL) {
-    self.selectedNTPPanel = ntp_home::HOME_PANEL;
-    if (!self.homeViewController)
-      [self.dispatcher showNTPHomePanel];
-  } else if (item.identifier == ntp_home::RECENT_TABS_PANEL) {
-    self.selectedNTPPanel = ntp_home::RECENT_TABS_PANEL;
-    if (!self.recentTabsViewController)
-      [self.dispatcher showNTPRecentTabsPanel];
+  if (item.identifier == ntp_home::BOOKMARKS_PANEL &&
+      !self.bookmarksViewController) {
+    [self.dispatcher showNTPBookmarksPanel];
+  } else if (item.identifier == ntp_home::HOME_PANEL &&
+             !self.homeViewController) {
+    [self.dispatcher showNTPHomePanel];
+  } else if (item.identifier == ntp_home::RECENT_TABS_PANEL &&
+             !self.recentTabsViewController) {
+    [self.dispatcher showNTPRecentTabsPanel];
   }
+  self.selectedNTPPanel = item.identifier;
 
   // If index changed, follow same path as if a tab bar item was pressed.  When
   // |index| == |position|, the panel is completely in view.

ios/showcase/ntp/BUILD.gn

@@ -8,6 +8,7 @@ source_set("ntp") {
     "sc_ntp_coordinator.mm",
   ]
   deps = [
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/ntp:ntp_ui",

ios/showcase/ntp/sc_ntp_coordinator.mm

@@ -4,6 +4,7 @@
 
 #import "ios/showcase/ntp/sc_ntp_coordinator.h"
 
+#import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_bar_item.h"
 #import "ios/clean/chrome/browser/ui/commands/ntp_commands.h"
 #import "ios/clean/chrome/browser/ui/ntp/ntp_view_controller.h"
@@ -32,11 +33,11 @@
 
   NewTabPageBarItem* item1 = [NewTabPageBarItem
       newTabPageBarItemWithTitle:@"Item 1"
-                      identifier:0
+                      identifier:ntp_home::HOME_PANEL
                            image:[UIImage imageNamed:@"ntp_mv_search"]];
   NewTabPageBarItem* item2 = [NewTabPageBarItem
       newTabPageBarItemWithTitle:@"Item 2"
-                      identifier:0
+                      identifier:ntp_home::BOOKMARKS_PANEL
                            image:[UIImage imageNamed:@"ntp_bookmarks"]];
   [ntp setBarItems:@[ item1, item2 ]];