Add method GetToolbarVoiceSearchButtonImages

Add GetToolbarVoiceSearchButtonImages(bool) to BrandedImageProvider
to allow eventually remove GetToolbarVoiceSearchButtonImageId(int*)
and to allow make provider use simpler (no need to check the return
value).

Bug: none
Change-Id: Ibd25cb14018debe6b87fdc8a4c7af3c92a21a6c5
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Reviewed-on: https://chromium-review.googlesource.com/951691
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541765}

ios/chrome/browser/providers/images/chromium_branded_image_provider.h

@@ -19,6 +19,7 @@ class ChromiumBrandedImageProvider : public BrandedImageProvider {
   UIImage* GetSigninConfirmationSyncSettingsImage() override;
   UIImage* GetSigninConfirmationPersonalizeServicesImage() override;
   bool GetToolbarVoiceSearchButtonImageId(int* image_id) override;
+  NSArray<UIImage*>* GetToolbarVoiceSearchButtonImages(bool incognito) override;
   UIImage* GetWhatsNewIconImage(WhatsNewIcon type) override;
   UIImage* GetToolbarSearchButtonImage(SearchEngineIcon type) override;
   UIImage* GetDownloadGoogleDriveImage() override;

ios/chrome/browser/providers/images/chromium_branded_image_provider.mm

@@ -50,6 +50,23 @@ bool ChromiumBrandedImageProvider::GetToolbarVoiceSearchButtonImageId(
   return false;
 }
 
+NSArray<UIImage*>*
+ChromiumBrandedImageProvider::GetToolbarVoiceSearchButtonImages(
+    bool incognito) {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  if (incognito) {
+    return @[
+      rb.GetNativeImageNamed(IDR_IOS_TOOLBAR_DARK_VOICE).ToUIImage(),
+      rb.GetNativeImageNamed(IDR_IOS_TOOLBAR_DARK_VOICE_PRESSED).ToUIImage()
+    ];
+  }
+
+  return @[
+    rb.GetNativeImageNamed(IDR_IOS_TOOLBAR_LIGHT_VOICE).ToUIImage(),
+    rb.GetNativeImageNamed(IDR_IOS_TOOLBAR_LIGHT_VOICE_PRESSED).ToUIImage()
+  ];
+}
+
 UIImage* ChromiumBrandedImageProvider::GetWhatsNewIconImage(WhatsNewIcon type) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(IDR_IOS_PROMO_INFO).ToUIImage();

ios/public/provider/chrome/browser/images/BUILD.gn

@@ -13,6 +13,7 @@ source_set("images") {
     "//base",
     "//components/search_engines",
   ]
+  libs = [ "UIKit.framework" ]
 }
 
 source_set("test_support") {

ios/public/provider/chrome/browser/images/branded_image_provider.h

@@ -5,11 +5,11 @@
 #ifndef IOS_PUBLIC_PROVIDER_CHROME_BROWSER_IMAGES_BRANDED_IMAGE_PROVIDER_H_
 #define IOS_PUBLIC_PROVIDER_CHROME_BROWSER_IMAGES_BRANDED_IMAGE_PROVIDER_H_
 
+#import <UIKit/UIKit.h>
+
 #include "base/macros.h"
 #include "ios/public/provider/chrome/browser/images/branded_image_icon_types.h"
 
-@class UIImage;
-
 // BrandedImageProvider vends images that contain embedder-specific branding.
 // When adding method to this class, do not forget to add Chromium specific
 // implementation to ChromiumBrandedImageProvider (the file may not be in the
@@ -43,8 +43,13 @@ class BrandedImageProvider {
   // image for the toolbar voice search button.  If this method returns false,
   // |image_id| is invalid and callers should fall back to a default image.  The
   // returned image should be used for all toolbar styles and all button states.
+  // Deprecated, use GetToolbarVoiceSearchButtonImages(bool) instead.
   virtual bool GetToolbarVoiceSearchButtonImageId(int* image_id);
 
+  // Returns two 24pt x 24pt images to use for toolbar voice search button. The
+  // images corresponds to the normal and pressed state.
+  virtual NSArray<UIImage*>* GetToolbarVoiceSearchButtonImages(bool incognito);
+
   // Returns the 24pt x 24pt image corresponding to the given icon |type|.
   virtual UIImage* GetWhatsNewIconImage(WhatsNewIcon type);
 

ios/public/provider/chrome/browser/images/branded_image_provider.mm

@@ -38,6 +38,11 @@ bool BrandedImageProvider::GetToolbarVoiceSearchButtonImageId(int* image_id) {
   return false;
 }
 
+NSArray<UIImage*>* BrandedImageProvider::GetToolbarVoiceSearchButtonImages(
+    bool incognito) {
+  return nil;
+}
+
 UIImage* BrandedImageProvider::GetWhatsNewIconImage(WhatsNewIcon type) {
   return nil;
 }