[ios] Refactor tab grid toolbars and buttons configuration

The configuration of the toolbars and buttons has gotten
unwieldy so this CL attempts to simplify the code.

This CL also adds assets for the new tab button.

Bug: 818198
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I705ac71ac0c09bc2fea613247a2c043e5cd7ac39
Reviewed-on: https://chromium-review.googlesource.com/961662
Commit-Queue: edchin <edchin@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543115}

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

@@ -68,7 +68,8 @@ source_set("tab_grid_ui") {
 
   deps = [
     "resources:grid_close_cell",
-    "resources:tab_grid_new_tab_fab",
+    "resources:new_tab_floating_button",
+    "resources:new_tab_floating_button_incognito",
     "//base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",

ios/chrome/browser/ui/tab_grid/resources/BUILD.gn

@@ -13,11 +13,20 @@ imageset("grid_close_cell") {
   ]
 }
 
-imageset("tab_grid_new_tab_fab") {
+imageset("new_tab_floating_button") {
   sources = [
-    "tab_grid_new_tab_fab.imageset/Contents.json",
-    "tab_grid_new_tab_fab.imageset/tab_grid_new_tab_fab.png",
-    "tab_grid_new_tab_fab.imageset/tab_grid_new_tab_fab@2x.png",
-    "tab_grid_new_tab_fab.imageset/tab_grid_new_tab_fab@3x.png",
+    "new_tab_floating_button.imageset/Contents.json",
+    "new_tab_floating_button.imageset/new_tab_floating_button.png",
+    "new_tab_floating_button.imageset/new_tab_floating_button@2x.png",
+    "new_tab_floating_button.imageset/new_tab_floating_button@3x.png",
+  ]
+}
+
+imageset("new_tab_floating_button_incognito") {
+  sources = [
+    "new_tab_floating_button_incognito.imageset/Contents.json",
+    "new_tab_floating_button_incognito.imageset/new_tab_floating_button_incognito.png",
+    "new_tab_floating_button_incognito.imageset/new_tab_floating_button_incognito@2x.png",
+    "new_tab_floating_button_incognito.imageset/new_tab_floating_button_incognito@3x.png",
   ]
 }

ios/chrome/browser/ui/tab_grid/resources/tab_grid_new_tab_fab.imageset/Contents.json → ios/chrome/browser/ui/tab_grid/resources/new_tab_floating_button.imageset/Contents.json

@@ -3,17 +3,17 @@
         {
             "idiom": "universal",
             "scale": "1x",
-            "filename": "tab_grid_new_tab_fab.png"
+            "filename": "new_tab_floating_button.png"
         },
         {
             "idiom": "universal",
             "scale": "2x",
-            "filename": "tab_grid_new_tab_fab@2x.png"
+            "filename": "new_tab_floating_button@2x.png"
         },
         {
             "idiom": "universal",
             "scale": "3x",
-            "filename": "tab_grid_new_tab_fab@3x.png"
+            "filename": "new_tab_floating_button@3x.png"
         }
     ],
     "info": {

ios/chrome/browser/ui/tab_grid/resources/new_tab_floating_button_incognito.imageset/Contents.json

+{
+    "images": [
+        {
+            "idiom": "universal",
+            "scale": "1x",
+            "filename": "new_tab_floating_button_incognito.png"
+        },
+        {
+            "idiom": "universal",
+            "scale": "2x",
+            "filename": "new_tab_floating_button_incognito@2x.png"
+        },
+        {
+            "idiom": "universal",
+            "scale": "3x",
+            "filename": "new_tab_floating_button_incognito@3x.png"
+        }
+    ],
+    "info": {
+        "version": 1,
+        "author": "xcode"
+    }
+}