Revert 132517 - Metro/HiDPI: Move 1x icons into separate pak file

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 "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 26 matching lines @@
   }
   if (!resource_path)
     return FilePath();
   return FilePath([resource_path fileSystemRepresentation]);
 }
 
 }  // namespace
 
 void ResourceBundle::LoadCommonResources() {
   AddDataPack(GetResourcesPakFilePath(@"chrome", nil));
-  AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil));
-  AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil));
-
-  // On Windows and ChromeOS we load either the 1x resource or the 2x resource.
-  // On Mac we load both and let the UI framework decide which one to use.
-#if defined(ENABLE_HIDPI)
-  if (base::mac::IsOSLionOrLater()) {
+  if (base::mac::IsOSLionOrLater())
     AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil));
-    AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil));
-    AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil));
-  }
-#endif
 }
 
 // static
 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
   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:@"_"];
 
@@ skipping 54 matching lines @@
   if (images_.count(resource_id)) {
     return *images_[resource_id];
   }
 
   gfx::Image* image = new gfx::Image(ns_image.release());
   images_[resource_id] = image;
   return *image;
 }
 
 }  // namespace ui