Revert 150411 - Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files.

This broke Google Chrome Linux builders which are still looking for theme_resources_100_percent.pak.

BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.

Review URL: https://chromiumcodereview.appspot.com/10825111

TBR=flackr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10825234

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

build/android/pylib/test_package.py

@@ -119,8 +119,11 @@ class TestPackage(object):
           self.test_suite_dirname + '/resources.pak',
           '/data/local/tmp/paks/resources.pak')
       self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/chrome_100_percent.pak',
-          '/data/local/tmp/paks/chrome_100_percent.pak')
+          self.test_suite_dirname + '/theme_resources_100_percent.pak',
+          '/data/local/tmp/paks/theme_resources_100_percent.pak')
+      self.adb.PushIfNeeded(
+          self.test_suite_dirname + '/ui_resources_100_percent.pak',
+          '/data/local/tmp/paks/ui_resources_100_percent.pak')
       self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data',
                             '/data/local/tmp/test_data')
     if self.test_suite_basename == 'content_unittests':

chrome/chrome_dll.gypi

@@ -289,8 +289,9 @@
                 'app/theme/otr_icon.pdf',
                 'browser/mac/install.sh',
                 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
                 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
+                '<(grit_out_dir)/theme_resources_100_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
                 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
                 # Note: pseudo_locales are generated via the packed_resources
                 # dependency but not copied to the final target.  See
@@ -531,7 +532,9 @@
                 }],
                 ['enable_hidpi==1', {
                   'mac_bundle_resources': [
-                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
+                    '<(grit_out_dir)/theme_resources_200_percent.pak',
+                    '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
+                    '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak',
                   ],
                 }],
               ],  # conditions

chrome/chrome_repack_chrome_100_percent.gypi

-# 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.
-{
-  'action_name': 'repack_chrome_resources_100_percent',
-  'variables': {
-    'pak_inputs': [
-      '<(grit_out_dir)/theme_resources_100_percent.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
-    ],
-  },
-  'inputs': [
-    '<(repack_path)',
-    '<@(pak_inputs)',
-  ],
-  'outputs': [
-    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
-  ],
-  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-}

chrome/chrome_repack_chrome_200_percent.gypi

-# 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.
-{
-  'action_name': 'repack_chrome_resources_200_percent',
-  'variables': {
-    'pak_inputs': [
-      '<(grit_out_dir)/theme_resources_200_percent.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak',
-    ],
-  },
-  'inputs': [
-    '<(repack_path)',
-    '<@(pak_inputs)',
-  ],
-  'outputs': [
-    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
-  ],
-  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-}

chrome/chrome_repack_chrome_touch_100_percent.gypi

-# 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.
-{
-  'action_name': 'repack_chrome_touch_resources_100_percent',
-  'variables': {
-    'pak_inputs': [
-      '<(grit_out_dir)/theme_resources_touch_100_percent.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_100_percent.pak',
-    ],
-  },
-  'inputs': [
-    '<(repack_path)',
-    '<@(pak_inputs)',
-  ],
-  'outputs': [
-    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak',
-  ],
-  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-}

chrome/chrome_repack_chrome_touch_200_percent.gypi

-# 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.
-{
-  'action_name': 'repack_chrome_touch_resources_200_percent',
-  'variables': {
-    'pak_inputs': [
-      '<(grit_out_dir)/theme_resources_touch_200_percent.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_200_percent.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak',
-    ],
-  },
-  'inputs': [
-    '<(repack_path)',
-    '<@(pak_inputs)',
-  ],
-  'outputs': [
-    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_200_percent.pak',
-  ],
-  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-}

chrome/chrome_resources.gyp

@@ -221,6 +221,53 @@
         'theme_resources_gen',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
       ],
+      'conditions': [
+        ['OS != "mac"', {
+          # Copy pak files to the product directory. These files will be picked
+          # up by the following installer scripts:
+          #   - Windows: chrome/installer/mini_installer/chrome.release
+          #   - Linux: chrome/installer/linux/internal/common/installer.include
+          # Ensure that the above scripts are updated when adding or removing
+          # pak files.
+          # Copying files to the product directory is not needed on the Mac
+          # since the framework build phase will copy them into the framework
+          # bundle directly.
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(grit_out_dir)/theme_resources_100_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+              ],
+            },
+          ],
+        }],
+        ['(OS != "mac" and enable_hidpi == 1) or chromeos == 1', {
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(grit_out_dir)/theme_resources_200_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak',
+              ],
+            },
+          ],
+        }],
+        ['enable_touch_ui==1', {
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(grit_out_dir)/theme_resources_touch_100_percent.pak',
+                '<(grit_out_dir)/theme_resources_touch_200_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_100_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_200_percent.pak',
+              ],
+            },
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'packed_extra_resources',
@@ -283,30 +330,11 @@
         {
           'includes': ['chrome_repack_pseudo_locales.gypi']
         },
-        {
-          'includes': ['chrome_repack_chrome_100_percent.gypi']
-        },
-        {
-          'includes': ['chrome_repack_chrome_200_percent.gypi']
-        },
-        {
-          'includes': ['chrome_repack_chrome_touch_100_percent.gypi']
-        },
-        {
-          'includes': ['chrome_repack_chrome_touch_200_percent.gypi']
-        },
       ],
       'conditions': [
         ['OS != "mac"', {
-          # Copy pak files to the product directory. These files will be picked
-          # up by the following installer scripts:
-          #   - Windows: chrome/installer/mini_installer/chrome.release
-          #   - Linux: chrome/installer/linux/internal/common/installer.include
-          # Ensure that the above scripts are updated when adding or removing
-          # pak files.
-          # Copying files to the product directory is not needed on the Mac
-          # since the framework build phase will copy them into the framework
-          # bundle directly.
+          # We'll install the resource files to the product directory.  The Mac
+          # copies the results over as bundle resources in its own special way.
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)',
@@ -314,12 +342,6 @@
                 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak'
               ],
             },
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': [
-                '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak'
-              ],
-            },
             {
               'destination': '<(PRODUCT_DIR)/locales',
               'files': [
@@ -347,36 +369,6 @@
                 },
               ],
             }],
-            ['enable_hidpi == 1 or chromeos == 1', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)',
-                  'files': [
-                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
-                  ],
-                },
-              ],
-            }],
-            ['enable_touch_ui==1', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)',
-                  'files': [
-                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak',
-                  ],
-                },
-              ],
-            }],
-            ['enable_hidpi == 1 and enable_touch_ui==1', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)',
-                  'files': [
-                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_200_percent.pak',
-                  ],
-                },
-              ],
-            }],
           ], # conditions
         }], # end OS != "mac"
       ], # conditions

chrome/installer/mini_installer/chrome.release

@@ -13,7 +13,8 @@ nacl_irt_x86_32.nexe: %(VersionDir)s\
 nacl_irt_x86_64.nexe: %(VersionDir)s\
 icudt.dll: %(VersionDir)s\
 resources.pak: %(VersionDir)s\
-chrome_100_percent.pak: %(VersionDir)s\
+theme_resources_100_percent.pak: %(VersionDir)s\
+ui_resources_100_percent.pak: %(VersionDir)s\
 locales\*.pak: %(VersionDir)s\Locales
 locales\*.dll: %(VersionDir)s\Locales
 npchrome_frame.dll: %(VersionDir)s\
@@ -32,10 +33,12 @@ default_apps\*.crx: %(VersionDir)s\default_apps\
 default_apps\external_extensions.json: %(VersionDir)s\default_apps\
 
 [HIDPI]
-chrome_200_percent.pak: %(VersionDir)s\
+theme_resources_200_percent.pak: %(VersionDir)s\
+ui_resources_200_percent.pak: %(VersionDir)s\
+webkit_resources_200_percent.pak: %(VersionDir)s\
 
 [TOUCH]
-chrome_touch_100_percent.pak: %(VersionDir)s\
+theme_resources_touch_100_percent.pak: %(VersionDir)s\
 
 [GOOGLE_CHROME]
 FlashPlayerApp.exe: %(VersionDir)s\

chrome/tools/build/chromeos/FILES.cfg

@@ -39,11 +39,6 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
-  {
-    'filename': 'chrome_100_percent.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-  },
   {
     'filename': 'chrome_sandbox',
     'arch': ['32bit', '64bit'],
@@ -89,6 +84,16 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
+  {
+    'filename': 'theme_resources_100_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'ui_resources_100_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
   {
     'filename': 'session',
     'arch': ['32bit', '64bit'],

chrome/tools/build/linux/FILES.cfg

@@ -41,11 +41,6 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
-  {
-    'filename': 'chrome_100_percent.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-  },
   {
     'filename': 'chrome_sandbox',
     'arch': ['32bit', '64bit'],
@@ -91,6 +86,16 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
+  {
+    'filename': 'theme_resources_100_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'ui_resources_100_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
   {
     'filename': 'session',
     'arch': ['32bit', '64bit'],

chrome/tools/build/win/FILES.cfg

@@ -69,23 +69,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
     'filegroup': ['default', 'symsrc'],
   },
-  {
-    'filename': 'chrome_100_percent.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'chrome_200_percent.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-    'optional': ['dev', 'official'],
-  },
-  {
-    'filename': 'chrome_touch_100_percent.pak',
-    'arch': ['32bit', '64bit'],
-    'buildtype': ['dev', 'official'],
-    'optional': ['dev', 'official'],
-  },
   {
     'filename': 'crash_service.exe',
     'arch': ['32bit', '64bit'],
@@ -367,6 +350,40 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
+  {
+    'filename': 'theme_resources_100_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'theme_resources_200_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+    'optional': ['dev', 'official'],
+  },
+  {
+    'filename': 'theme_resources_touch_100_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+    'optional': ['dev', 'official'],
+  },
+  {
+    'filename': 'ui_resources_100_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'ui_resources_200_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+    'optional': ['dev', 'official'],
+  },
+  {
+    'filename': 'webkit_resources_200_percent.pak',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+    'optional': ['dev', 'official'],
+  },
   {
     'filename': 'wow_helper.exe',
     'arch': ['32bit', '64bit'],

ui/base/resource/resource_bundle_android.cc

@@ -21,7 +21,9 @@ void ResourceBundle::LoadCommonResources() {
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path);
   AddDataPackFromPath(path.AppendASCII("chrome.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(path.AppendASCII("chrome_100_percent.pak"),
+  AddDataPackFromPath(path.AppendASCII("theme_resources_100_percent.pak"),
+                      SCALE_FACTOR_100P);
+  AddDataPackFromPath(path.AppendASCII("ui_resources_100_percent.pak"),
                       SCALE_FACTOR_100P);
 }
 

ui/base/resource/resource_bundle_aurax11.cc

@@ -45,23 +45,41 @@ void ResourceBundle::LoadCommonResources() {
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     // 1x touch
     AddDataPackFromPath(GetResourcesPakFilePath(
-                        "chrome_touch_100_percent.pak"),
+                        "theme_resources_touch_100_percent.pak"),
+                        SCALE_FACTOR_100P);
+    AddDataPackFromPath(GetResourcesPakFilePath(
+                        "ui_resources_touch_100_percent.pak"),
                         SCALE_FACTOR_100P);
     if (ShouldLoad2xResources()) {
       // 2x touch
       AddDataPackFromPath(GetResourcesPakFilePath(
-                          "chrome_touch_200_percent.pak"),
+                          "theme_resources_touch_200_percent.pak"),
+                          SCALE_FACTOR_200P);
+      AddDataPackFromPath(GetResourcesPakFilePath(
+                          "ui_resources_touch_200_percent.pak"),
+                          SCALE_FACTOR_200P);
+      AddDataPackFromPath(GetResourcesPakFilePath(
+                          "webkit_resources_200_percent.pak"),
                           SCALE_FACTOR_200P);
     }
   } else {
     // 1x non touch
     AddDataPackFromPath(GetResourcesPakFilePath(
-                        "chrome_100_percent.pak"),
+                        "theme_resources_100_percent.pak"),
+                        SCALE_FACTOR_100P);
+    AddDataPackFromPath(GetResourcesPakFilePath(
+                        "ui_resources_100_percent.pak"),
                         SCALE_FACTOR_100P);
     if (ShouldLoad2xResources()) {
       // 2x non touch
       AddDataPackFromPath(GetResourcesPakFilePath(
-                          "chrome_200_percent.pak"),
+                          "theme_resources_200_percent.pak"),
+                          SCALE_FACTOR_200P);
+      AddDataPackFromPath(GetResourcesPakFilePath(
+                          "ui_resources_200_percent.pak"),
+                          SCALE_FACTOR_200P);
+      AddDataPackFromPath(GetResourcesPakFilePath(
+                          "webkit_resources_200_percent.pak"),
                           SCALE_FACTOR_200P);
     }
   }

ui/base/resource/resource_bundle_gtk.cc

@@ -68,7 +68,10 @@ void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
                       SCALE_FACTOR_100P);
   AddDataPackFromPath(GetResourcesPakFilePath(
-                      "chrome_100_percent.pak"),
+                      "theme_resources_100_percent.pak"),
+                      SCALE_FACTOR_100P);
+  AddDataPackFromPath(GetResourcesPakFilePath(
+                      "ui_resources_100_percent.pak"),
                       SCALE_FACTOR_100P);
 }
 

ui/base/resource/resource_bundle_mac.mm

@@ -51,7 +51,9 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
+  AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_100_percent",
+                        nil), SCALE_FACTOR_100P);
+  AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_100_percent",
                         nil), SCALE_FACTOR_100P);
   AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
                         nil), SCALE_FACTOR_100P);
@@ -60,7 +62,9 @@ void ResourceBundle::LoadCommonResources() {
   // On Mac we load both and let the UI framework decide which one to use.
 #if defined(ENABLE_HIDPI)
   if (base::mac::IsOSLionOrLater()) {
-    AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent",
+    AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_200_percent",
+                          nil), SCALE_FACTOR_200P);
+    AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
                           nil), SCALE_FACTOR_200P);
     AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_200_percent",
                           nil), SCALE_FACTOR_200P);

ui/base/resource/resource_bundle_win.cc

@@ -49,20 +49,29 @@ void ResourceBundle::LoadCommonResources() {
   switch (ui::GetDisplayLayout()) {
     case ui::LAYOUT_TOUCH:
       AddDataPackFromPath(
-          GetResourcesPakFilePath("chrome_touch_100_percent.pak"),
+          GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"),
+          SCALE_FACTOR_100P);
+      AddDataPackFromPath(
+          GetResourcesPakFilePath("ui_resources_100_percent.pak"),
           SCALE_FACTOR_100P);
       break;
     default:
       if (use_hidpi) {
         AddDataPackFromPath(GetResourcesPakFilePath(
-                            "chrome_200_percent.pak"),
+                            "theme_resources_200_percent.pak"),
+                            SCALE_FACTOR_200P);
+        AddDataPackFromPath(GetResourcesPakFilePath(
+                            "ui_resources_200_percent.pak"),
                             SCALE_FACTOR_200P);
         AddDataPackFromPath(GetResourcesPakFilePath(
                             "webkit_resources_200_percent.pak"),
                             SCALE_FACTOR_200P);
       } else {
         AddDataPackFromPath(
-            GetResourcesPakFilePath("chrome_100_percent.pak"),
+            GetResourcesPakFilePath("theme_resources_100_percent.pak"),
+            SCALE_FACTOR_100P);
+        AddDataPackFromPath(
+            GetResourcesPakFilePath("ui_resources_100_percent.pak"),
             SCALE_FACTOR_100P);
       }
       break;

ui/test/test_suite.cc

@@ -59,7 +59,7 @@ void UITestSuite::Initialize() {
 
 #if !defined(OS_MACOSX) && defined(OS_POSIX)
   ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_dir.AppendASCII("chrome_100_percent.pak"),
+      pak_dir.AppendASCII("ui_resources_100_percent.pak"),
       ui::SCALE_FACTOR_100P);
 #endif
 }