Change browser/page action default icon defined in manifest to support hidpi.

chrome/common/extensions/extension_file_util.cc

 // 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 "chrome/common/extensions/extension_file_util.h"
 
 #include <map>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 17 matching lines @@
 #include "chrome/common/extensions/message_bundle.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/file_stream.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
 
 namespace errors = extension_manifest_errors;
 
+namespace {
+
+bool ValidateExtensionIconSet(const ExtensionIconSet* icon_set,
+                              const Extension* extension,
+                              int error_message_id,
+                              std::string* error) {
+  for (ExtensionIconSet::IconMap::const_iterator iter = icon_set->map().begin();
+       iter != icon_set->map().end();
+       ++iter) {
+    const FilePath path = extension->GetResource(iter->second).GetFilePath();
+    if (!extension_file_util::ValidateFilePath(path)) {
+      *error = l10n_util::GetStringFUTF8(error_message_id,
+                                         UTF8ToUTF16(iter->second));
+      return false;
+    }
+  }
+  return true;
+}
+
+}  // namespace
+
 namespace extension_file_util {
 
 // Validates locale info. Doesn't check if messages.json files are valid.
 static bool ValidateLocaleInfo(const Extension& extension,
                                std::string* error);
 
 // Returns false and sets the error if script file can't be loaded,
 // or if it's not UTF-8 encoded.
 static bool IsScriptValid(const FilePath& path, const FilePath& relative_path,
                           int message_id, std::string* error);
@@ skipping 265 matching lines @@
     const Extension::PluginInfo& plugin = extension->plugins()[i];
     if (!file_util::PathExists(plugin.path)) {
       *error =
           l10n_util::GetStringFUTF8(
               IDS_EXTENSION_LOAD_PLUGIN_PATH_FAILED,
               plugin.path.LossyDisplayName());
       return false;
     }
   }
 
-  // Validate icon location and icon file size for page actions.
-  ExtensionAction* page_action = extension->page_action();
-  if (page_action) {
-    std::string path = page_action->default_icon_path();
-    if (!path.empty()) {
-      const FilePath file_path = extension->GetResource(path).GetFilePath();
-      if (!ValidateFilePath(file_path)) {
-        *error =
-            l10n_util::GetStringFUTF8(
-                IDS_EXTENSION_LOAD_ICON_FOR_PAGE_ACTION_FAILED,
-                UTF8ToUTF16(path));
-        return false;
-      }
-    }
+  const ExtensionAction* action = extension->page_action();
+  if (action && action->default_icon() &&
+      !ValidateExtensionIconSet(action->default_icon(), extension,
+          IDS_EXTENSION_LOAD_ICON_FOR_PAGE_ACTION_FAILED, error)) {
+    return false;
   }
 
-  // Validate icon location and icon file size for browser actions.
-  ExtensionAction* browser_action = extension->browser_action();
-  if (browser_action) {
-    std::string path = browser_action->default_icon_path();
-    if (!path.empty()) {
-      const FilePath file_path = extension->GetResource(path).GetFilePath();
-      if (!ValidateFilePath(file_path)) {
-        *error =
-            l10n_util::GetStringFUTF8(
-                IDS_EXTENSION_LOAD_ICON_FOR_BROWSER_ACTION_FAILED,
-                UTF8ToUTF16(path));
-        return false;
-      }
-    }
+  action = extension->browser_action();
+  if (action && action->default_icon() &&
+      !ValidateExtensionIconSet(action->default_icon(), extension,
+          IDS_EXTENSION_LOAD_ICON_FOR_BROWSER_ACTION_FAILED, error)) {
+    return false;
   }
 
   // Validate that background scripts exist.
   for (size_t i = 0; i < extension->background_scripts().size(); ++i) {
     if (!file_util::PathExists(
             extension->GetResource(
                 extension->background_scripts()[i]).GetFilePath())) {
       *error = l10n_util::GetStringFUTF8(
           IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED,
           UTF8ToUTF16(extension->background_scripts()[i]));
@@ skipping 419 matching lines @@
     return temp_path;
 
   return FilePath();
 }
 
 void DeleteFile(const FilePath& path, bool recursive) {
   file_util::Delete(path, recursive);
 }
 
 }  // namespace extension_file_util