Remove material design resource pak infrastructure

ui/base/resource/resource_bundle_mac.mm

 // Copyright (c) 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.
 
 #include "ui/base/resource/resource_bundle.h"
 
 #import <AppKit/AppKit.h>
 #include <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/lock.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_handle.h"
 #include "ui/gfx/image/image.h"
 
 namespace ui {
 
 namespace {
 
 base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
   NSString *resource_path;
   // Some of the helper processes need to be able to fetch resources
@@ skipping 25 matching lines @@
                         nil), SCALE_FACTOR_100P);
 
   // On Mac we load 1x and 2x resources and we let the UI framework decide
   // which one to use.
   if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
     AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent", nil),
                         SCALE_FACTOR_200P);
   }
 }
 
-void ResourceBundle::LoadMaterialDesignResources() {
-  if (!MaterialDesignController::IsModeMaterial()) {
-    return;
-  }
-
-  // The Material Design data packs contain some of the same asset IDs as in
-  // the non-Material Design data packs. Set aside the current packs and add the
-  // Material Design packs so that they are searched first when a request for an
-  // asset is made. The Material Design packs cannot be loaded in
-  // LoadCommonResources() because the MaterialDesignController is not always
-  // initialized at the time it is called.
-  // TODO(shrike) - remove this method and restore loading of Material Design
-  // packs to LoadCommonResources() when the MaterialDesignController goes away.
-  std::vector<std::unique_ptr<ResourceHandle>> tmp_packs;
-  for (auto it = data_packs_.begin(); it != data_packs_.end(); ++it) {
-    std::unique_ptr<ResourceHandle> next_pack(*it);
-    tmp_packs.push_back(std::move(next_pack));
-  }
-  data_packs_.weak_clear();
-
-  AddMaterialDesignDataPackFromPath(
-      GetResourcesPakFilePath(@"chrome_material_100_percent", nil),
-      SCALE_FACTOR_100P);
-
-  AddOptionalMaterialDesignDataPackFromPath(
-      GetResourcesPakFilePath(@"chrome_material_200_percent", nil),
-      SCALE_FACTOR_200P);
-
-  // Add back the non-Material Design packs so that they serve as a fallback.
-  for (auto it = tmp_packs.begin(); it != tmp_packs.end(); ++it) {
-    data_packs_.push_back(std::move(*it));
-  }
-}
-
 base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
                                                  bool test_file_exists) {
   NSString* mac_locale = base::SysUTF8ToNSString(app_locale);
 
   // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value.
   mac_locale = [mac_locale stringByReplacingOccurrencesOfString:@"-"
                                                      withString:@"_"];
 
   // On disk, the "en_US" resources are just "en" (http://crbug.com/25578).
   if ([mac_locale isEqual:@"en_US"])
@@ skipping 31 matching lines @@
       return images_[resource_id];
     }
   }
 
   gfx::Image image;
   if (delegate_)
     image = delegate_->GetNativeImageNamed(resource_id);
 
   if (image.IsEmpty()) {
     base::scoped_nsobject<NSImage> ns_image;
-    // Material Design packs are meant to override the standard packs, so
-    // search for the image in those packs first.
     for (size_t i = 0; i < data_packs_.size(); ++i) {
-      if (!data_packs_[i]->HasOnlyMaterialDesignAssets())
-        continue;
       scoped_refptr<base::RefCountedStaticMemory> data(
           data_packs_[i]->GetStaticMemory(resource_id));
       if (!data.get())
         continue;
 
       base::scoped_nsobject<NSData> ns_data(
           [[NSData alloc] initWithBytes:data->front() length:data->size()]);
       if (!ns_image.get()) {
         ns_image.reset([[NSImage alloc] initWithData:ns_data]);
       } else {
         NSImageRep* image_rep = [NSBitmapImageRep imageRepWithData:ns_data];
         if (image_rep)
           [ns_image addRepresentation:image_rep];
       }
     }
 
     if (ns_image.get()) {
       image = gfx::Image(ns_image.release());
     }
   }
 
   if (image.IsEmpty()) {
     base::scoped_nsobject<NSImage> ns_image;
     for (size_t i = 0; i < data_packs_.size(); ++i) {
-      if (data_packs_[i]->HasOnlyMaterialDesignAssets())
-        continue;
       scoped_refptr<base::RefCountedStaticMemory> data(
           data_packs_[i]->GetStaticMemory(resource_id));
       if (!data.get())
         continue;
 
       base::scoped_nsobject<NSData> ns_data(
           [[NSData alloc] initWithBytes:data->front() length:data->size()]);
       if (!ns_image.get()) {
         ns_image.reset([[NSImage alloc] initWithData:ns_data]);
       } else {
@@ skipping 16 matching lines @@
 
   // Another thread raced the load and has already cached the image.
   if (images_.count(resource_id))
     return images_[resource_id];
 
   images_[resource_id] = image;
   return images_[resource_id];
 }
 
 }  // namespace ui