Move extension/app default icon into src/extensions

BUG=407777
R=yoz@chromium.org, oshima@chromium.org, sky@chromium.org
TEST=manually

Review URL: https://codereview.chromium.org/535373002

Cr-Commit-Position: refs/heads/master@{#293549}

athena/content/DEPS

@@ -9,8 +9,10 @@ include_rules = [
   "+content/public",
   "+extensions/browser",
   "+extensions/common",
+  "+extensions/grit",
   "+ui/app_list",
   "+ui/aura",
+  "+ui/base/resource",
   "+ui/compositor",
   "+ui/gfx",
   "+ui/views",

athena/content/content_app_model_builder.cc

@@ -11,8 +11,10 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace athena {
 
@@ -66,8 +68,8 @@ class AppItem : public app_list::AppListItem {
                     extension.get(),
                     extensions::IconsInfo::GetIcons(extension.get()),
                     extension_misc::EXTENSION_ICON_MEDIUM,
-                    // TODO(mukai): better default icon
-                    CreateFlatColorImage(SK_ColorBLACK),
+                    *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+                        IDR_APP_DEFAULT_ICON),
                     NULL) {
     icon_image_.image_skia().EnsureRepsForSupportedScales();
     SetIcon(icon_image_.image_skia(), false);

athena/resources/athena_resources.gyp

@@ -50,6 +50,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
             '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
+            '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_browser_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',
           ],

chrome/app/theme/theme_resources.grd

@@ -35,7 +35,6 @@
       <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file="common/allowed_notifications.png" />
       <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="common/allowed_plugins.png" />
       <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="common/allowed_popups.png" />
-      <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="common/app_default_icon.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="common/app_droparrow.png" />
       <if expr="enable_app_list and is_win and not _google_chrome">
         <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="chromium/app_list_48.png" />
@@ -250,7 +249,6 @@
         <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_ON" file="common/extensions_rating_star_on.png" />
         <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_SECTION" file="common/extensions_section.png" />
         <structure type="chrome_scaled_image" name="IDR_EXTENSION_COMMAND_CLOSE" file="common/extension_command_close.png" />
-        <structure type="chrome_scaled_image" name="IDR_EXTENSION_DEFAULT_ICON" file="common/extension_default_icon.png" />
       </if>
       <if expr="chromeos">
         <structure type="chrome_scaled_image" name="IDR_FATAL_ERROR" file="cros/fatal_error.png" />
@@ -426,7 +424,7 @@
              reserve a valid ID, so the Android code can map it to the
              appropriate Android resource.  So we just refer to a random
              image. -->
-        <structure type="chrome_scaled_image" name="IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER" file="common/app_default_icon.png" />
+        <structure type="chrome_scaled_image" name="IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER" file="chromium/product_logo_32.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_INFOBAR_RESTORE_SESSION" file="common/infobar_restore_session.png" />
       <structure type="chrome_scaled_image" name="IDR_INFOBAR_SAVE_PASSWORD" file="common/infobar_save_password.png" />

chrome/browser/DEPS

@@ -84,6 +84,7 @@ include_rules = [
   "+device/media_transfer_protocol",
   "+extensions/browser",
   "+extensions/common",
+  "+extensions/grit",
   "+google/cacheinvalidation",  # Sync invalidation API protobuf files.
   "+google_apis",
   "+google_update",

chrome/browser/background/background_contents_service.cc

@@ -47,7 +47,7 @@
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
-#include "grit/theme_resources.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"

chrome/browser/extensions/api/developer_private/developer_private_api.cc

@@ -66,7 +66,7 @@
 #include "extensions/common/manifest_handlers/offline_enabled_info.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
-#include "grit/theme_resources.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"

chrome/browser/extensions/extension_util.cc

@@ -27,7 +27,7 @@
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
 #include "extensions/common/permissions/permissions_data.h"
-#include "grit/theme_resources.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace extensions {

chrome/browser/ui/apps/chrome_app_delegate.cc

@@ -27,7 +27,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "extensions/common/constants.h"
-#include "grit/theme_resources.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(USE_ASH)

chrome/browser/ui/webui/extensions/extension_icon_source.cc

@@ -25,8 +25,8 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "grit/component_extension_resources_map.h"
-#include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"

chrome/browser/web_applications/web_app.cc

@@ -25,7 +25,7 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
-#include "grit/theme_resources.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"

chrome/chrome_repack_chrome_100_percent.gypi

@@ -33,6 +33,11 @@
           '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
         ],
       }],
+      ['enable_extensions==1', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_browser_resources_100_percent.pak',
+        ],
+      }],
     ],
   },
   'includes': [ '../build/repack_action.gypi' ],

chrome/chrome_repack_chrome_200_percent.gypi

@@ -33,6 +33,11 @@
           '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak',
         ],
       }],
+      ['enable_extensions==1', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_browser_resources_200_percent.pak',
+        ],
+      }],
     ],
   },
   'includes': [ '../build/repack_action.gypi' ],

extensions/BUILD.gn

@@ -8,6 +8,7 @@ import("//tools/grit/repack.gni")
 # GYP version: extensions/extensions_resources.gyp:extensions_resources
 group("extensions_resources") {
   deps = [
+    ":extensions_browser_resources",
     ":extensions_renderer_resources",
     ":extensions_resources_grd",
   ]
@@ -24,7 +25,21 @@ grit("extensions_resources_grd") {
 }
 
 # GYP version: extensions/extensions_resources.gyp:extensions_resources
-#              (exntensions_renderer_resources action)
+#              (extensions_browser_resources action)
+grit("extensions_browser_resources") {
+  source = "browser/resources/extensions_browser_resources.grd"
+  outputs = [
+    "grit/extensions_browser_resources.h",
+    "grit/extensions_browser_resources_map.cc",
+    "grit/extensions_browser_resources_map.h",
+    "extensions_browser_resources_100_percent.pak",
+    "extensions_browser_resources_200_percent.pak",
+  ]
+  grit_flags = [ "-E", "mojom_root=" + rebase_path(root_gen_dir) ]
+}
+
+# GYP version: extensions/extensions_resources.gyp:extensions_resources
+#              (extensions_renderer_resources action)
 grit("extensions_renderer_resources") {
   source = "renderer/resources/extensions_renderer_resources.grd"
   outputs = [

extensions/browser/extension_icon_image.cc

@@ -210,11 +210,7 @@ void IconImage::OnImageLoaded(float scale, const gfx::Image& image_in) {
 
   gfx::ImageSkiaRep rep = image->GetRepresentation(scale);
   DCHECK(!rep.is_null());
-#if !defined(USE_ATHENA)
-  // TODO(oshima): It someshow gets 2x image for 1x for some extensions. Fix
-  // this.
   DCHECK_EQ(scale, rep.scale());
-#endif
 
   // Remove old representation if there is one.
   image_skia_.RemoveRepresentation(scale);

extensions/browser/resources/extensions_browser_resources.grd

+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="grit/extensions_browser_resources.h" type="rc_header" context="default_100_percent">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="grit/extensions_browser_resources_map.cc" type="resource_map_source" context="default_100_percent" />
+    <output filename="grit/extensions_browser_resources_map.h" type="resource_map_header" context="default_100_percent" />
+    <output filename="extensions_browser_resources_100_percent.pak" type="data_package" context="default_100_percent" />
+    <output filename="extensions_browser_resources_200_percent.pak" type="data_package" context="default_200_percent" />
+  </outputs>
+  <release seq="1">
+    <structures fallback_to_low_resolution="true">
+      <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSION_DEFAULT_ICON" file="extension_default_icon.png" />
+    </structures>
+  </release>
+</grit>

extensions/extensions_resources.gyp

@@ -18,6 +18,13 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
+        {
+          'action_name': 'generate_extensions_browser_resources',
+          'variables': {
+            'grit_grd_file': 'browser/resources/extensions_browser_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
         {
           'action_name': 'generate_extensions_renderer_resources',
           'variables': {

tools/gritsettings/resource_ids

@@ -174,8 +174,11 @@
   "extensions/extensions_resources.grd": {
     "includes": [26600],
   },
+  "extensions/browser/resources/extensions_browser_resources.grd": {
+    "structures": [26800],
+  },
   "extensions/renderer/resources/extensions_renderer_resources.grd": {
-    "includes": [26800],
+    "includes": [26850],
   },
   "extensions/extensions_strings.grd": {
     "messages": [27000],