Rename _large.grd to _2x.grd

BUG=111101
TEST=none


Review URL: http://codereview.chromium.org/9307110

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120838 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 14 insertions, 14 deletions

diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index 1fb7bd6..dd890d0 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -50,7 +50,7 @@ FilePath ResourceBundle::GetResourcesFilePath() {
 FilePath ResourceBundle::GetLargeIconResourcesFilePath() {
   // Only load the large resource pak when running on 10.7 or later.
   if (base::mac::IsOSLionOrLater())
-    return GetResourcesPakFilePath(@"theme_resources_large", nil);
+    return GetResourcesPakFilePath(@"theme_resources_2x", nil);
   else
     return FilePath();
 }
diff --git a/ui/base/resource/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc
index ec4e7ac..184f7b2 100644
--- a/ui/base/resource/resource_bundle_posix.cc
+++ b/ui/base/resource/resource_bundle_posix.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -60,7 +60,7 @@ void ResourceBundle::LoadCommonResources() {
     large_icon_resources_data_ =
         LoadResourcesDataPak(large_icon_resources_file_path);
     CHECK(large_icon_resources_data_) <<
-        "failed to load theme_resources_large.pak";
+        "failed to load theme_resources_2x.pak";
   }
 }
 
diff --git a/ui/resources/ui_resources_large.grd b/ui/resources/ui_resources_2x.grd
index 83cf7c2..f696cd9 100644
--- a/ui/resources/ui_resources_large.grd
+++ b/ui/resources/ui_resources_2x.grd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grit latest_public_release="0" current_release="1">
   <outputs>
-    <output filename="grit/ui_resources_large.h" type="rc_header">
+    <output filename="grit/ui_resources_2x.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="grit/ui_resources_large_map.cc" type="resource_map_source" />
-    <output filename="grit/ui_resources_large_map.h" type="resource_map_header" />
-    <output filename="ui_resources_large.pak" type="data_package" />
-    <output filename="ui_resources_large.rc" type="rc_all" />
+    <output filename="grit/ui_resources_2x_map.cc" type="resource_map_source" />
+    <output filename="grit/ui_resources_2x_map.h" type="resource_map_header" />
+    <output filename="ui_resources_2x.pak" type="data_package" />
+    <output filename="ui_resources_2x.rc" type="rc_all" />
   </outputs>
   <release seq="1">
     <includes>
diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd
index c18c12c..32c73a85 100644
--- a/ui/resources/ui_resources_standard.grd
+++ b/ui/resources/ui_resources_standard.grd
@@ -12,7 +12,7 @@
   <release seq="1">
     <includes>
       <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
-           ui_resources_large.grd. THIS MEANS THAT EACH ICON IN THIS FILE
+           ui_resources_2x.grd. THIS MEANS THAT EACH ICON IN THIS FILE
            MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
       <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index e7d6476..9aa93cc 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -22,16 +22,16 @@
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
-      'target_name': 'ui_resources_large',
+      'target_name': 'ui_resources_2x',
       'type': 'none',
       'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large',
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x',
       },
       'actions': [
         {
-          'action_name': 'ui_resources_large',
+          'action_name': 'ui_resources_2x',
           'variables': {
-            'grit_grd_file': 'resources/ui_resources_large.grd',
+            'grit_grd_file': 'resources/ui_resources_2x.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },