Factor iOS native image loading into a utility function.

ios/chrome/browser/ui/toolbar/toolbar_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h"
 
 #include <QuartzCore/QuartzCore.h>
 
 #include "base/format_macros.h"
 #include "base/i18n/rtl.h"
@@ skipping 16 matching lines @@
 #include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.h"
 #import "ios/chrome/browser/ui/toolbar/tools_menu_button_observer_bridge.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_menu_context.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_popup_controller.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/common/material_timing.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
-#include "ui/base/resource/resource_bundle.h"
 
 using base::UserMetricsAction;
 using ios::material::TimingFunction;
 
 // Animation key used for stack view transition animations
 NSString* const kToolbarTransitionAnimationKey = @"ToolbarTransitionAnimation";
 
 // Externed max tab count.
 const NSInteger kStackButtonMaxTabCount = 99;
 // Font sizes for the button containing the tab count
@@ skipping 168 matching lines @@
   base::scoped_nsobject<UIButton> shareButton_;
   base::scoped_nsobject<NSArray> standardButtons_;
   std::unique_ptr<ToolsMenuButtonObserverBridge> toolsMenuButtonObserverBridge_;
   ToolbarControllerStyle style_;
 
   // The following is nil if not visible.
   base::scoped_nsobject<ToolsPopupController> toolsPopupController_;
 }
 
 // Returns the background image that should be used for |style|.
-- (const gfx::Image&)getBackgroundImageForStyle:(ToolbarControllerStyle)style;
+- (UIImage*)getBackgroundImageForStyle:(ToolbarControllerStyle)style;
 
 // Whether the share button should be visible in the toolbar.
 - (BOOL)shareButtonShouldBeVisible;
 
 // Update share button visibility and |standardButtons_| array.
 - (void)updateStandardButtons;
 
 // Returns an animation for |button| for a toolbar transition animation with
 // |style|.  |button|'s frame will be interpolated between its layout in the
 // screen toolbar to the card's tab frame, and will be faded in for
@@ skipping 72 matching lines @@
                                       kToolbarShareButtonIdentifier);
       [view_ addSubview:shareButton_];
     }
 
     CGRect shadowFrame = kShadowViewFrame[idiom];
     shadowFrame.origin.y = CGRectGetMaxY(backgroundFrame);
     shadowView_.reset([[UIImageView alloc] initWithFrame:shadowFrame]);
     [shadowView_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
     [shadowView_ setUserInteractionEnabled:NO];
     [view_ addSubview:shadowView_];
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    gfx::Image shadow = rb.GetNativeImageNamed(IDR_IOS_TOOLBAR_SHADOW);
-    [shadowView_ setImage:shadow.ToUIImage()];
+    [shadowView_ setImage:NativeImage(IDR_IOS_TOOLBAR_SHADOW)];
 
     if (idiom == IPHONE_IDIOM) {
       // iPad omnibox does not expand to full bleed.
       CGRect fullBleedShadowFrame = kFullBleedShadowViewFrame;
       fullBleedShadowFrame.origin.y = shadowFrame.origin.y;
       fullBleedShadowView_.reset(
           [[UIImageView alloc] initWithFrame:fullBleedShadowFrame]);
       [fullBleedShadowView_
           setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
       [fullBleedShadowView_ setUserInteractionEnabled:NO];
       [fullBleedShadowView_ setAlpha:0];
       [view_ addSubview:fullBleedShadowView_];
-      gfx::Image fullBleedShadow =
-          rb.GetNativeImageNamed(IDR_IOS_TOOLBAR_SHADOW_FULL_BLEED);
-      [fullBleedShadowView_ setImage:fullBleedShadow.ToUIImage()];
+      [fullBleedShadowView_
+          setImage:NativeImage(IDR_IOS_TOOLBAR_SHADOW_FULL_BLEED)];
     }
 
     transitionLayers_.reset(
         [[NSMutableArray alloc] initWithCapacity:kTransitionLayerCapacity]);
 
     // UIImageViews do not default to userInteractionEnabled:YES.
     [view_ setUserInteractionEnabled:YES];
     [backgroundView_ setUserInteractionEnabled:YES];
 
-    gfx::Image tile = [self getBackgroundImageForStyle:style];
+    UIImage* tile = [self getBackgroundImageForStyle:style];
     [[self backgroundView]
-        setImage:StretchableImageFromUIImage(tile.ToUIImage(), 0.0, 3.0)];
+        setImage:StretchableImageFromUIImage(tile, 0.0, 3.0)];
 
     if (idiom == IPHONE_IDIOM) {
       stackButton_.reset(
           [[ToolbarCenteredButton alloc] initWithFrame:stackButtonFrame]);
       [stackButton_ setTag:IDC_TOGGLE_TAB_SWITCHER];
       [[stackButton_ titleLabel]
           setFont:[self fontForSize:kFontSizeFewerThanTenTabs]];
       [stackButton_
           setTitleColor:[UIColor colorWithWhite:kStackButtonNormalColors[style_]
                                           alpha:1.0]
@@ skipping 119 matching lines @@
 
   return YES;
 }
 
 - (void)setShareButtonEnabled:(BOOL)enabled {
   [shareButton_ setEnabled:enabled];
 }
 
 - (UIImage*)imageForImageEnum:(int)imageEnum
                      forState:(ToolbarButtonUIState)state {
-  int imageId =
+  int imageID =
       [self imageIdForImageEnum:imageEnum style:[self style] forState:state];
-  DCHECK(imageId);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  gfx::Image tile = rb.GetNativeImageNamed(imageId);
-  UIImage* image = tile.ToUIImage();
-  return (UseRTLLayout() &&
-          [self imageShouldFlipForRightToLeftLayoutDirection:imageEnum])
-             ? [image imageFlippedForRightToLeftLayoutDirection]
-             : image;
+  return NativeReversableImage(
+      imageID, [self imageShouldFlipForRightToLeftLayoutDirection:imageEnum]);
 }
 
 - (int)imageEnumForButton:(UIButton*)button {
   if (button == stackButton_.get())
     return ToolbarButtonNameStack;
   return NumberOfToolbarButtonNames;
 }
 
 - (int)imageIdForImageEnum:(int)index
                      style:(ToolbarControllerStyle)style
@@ skipping 125 matching lines @@
   }];
   // reset tabHistoryPopupController_ to prevent -applicationDidEnterBackground
   // from posting another kMenuWillHideNotification.
   toolsPopupController_.reset();
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kMenuWillHideNotification
                     object:nil];
 }
 
-- (const gfx::Image&)getBackgroundImageForStyle:(ToolbarControllerStyle)style {
-  int backgroundImageId;
+- (UIImage*)getBackgroundImageForStyle:(ToolbarControllerStyle)style {
+  int backgroundImageID;
   if (style == ToolbarControllerStyleLightMode)
-    backgroundImageId = IDR_IOS_TOOLBAR_LIGHT_BACKGROUND;
+    backgroundImageID = IDR_IOS_TOOLBAR_LIGHT_BACKGROUND;
   else
-    backgroundImageId = IDR_IOS_TOOLBAR_DARK_BACKGROUND;
+    backgroundImageID = IDR_IOS_TOOLBAR_DARK_BACKGROUND;
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  return rb.GetNativeImageNamed(backgroundImageId);
+  return NativeImage(backgroundImageID);
 }
 
 - (CGRect)specificControlsArea {
   // Return the rect to the leading side of the leading-most trailing control.
   UIView* trailingControl = toolsMenuButton_;
   if (!IsIPadIdiom())
     trailingControl = stackButton_;
   if ([self shareButtonShouldBeVisible])
     trailingControl = shareButton_;
   LayoutRect trailing =
@@ skipping 394 matching lines @@
 #pragma mark -
 #pragma mark PopupMenuDelegate methods.
 
 - (void)dismissPopupMenu:(PopupMenuController*)controller {
   if ([controller isKindOfClass:[ToolsPopupController class]] &&
       (ToolsPopupController*)controller == toolsPopupController_)
     [self dismissToolsMenuPopup];
 }
 
 @end