Move page actions over to ExtensionAction2

chrome/browser/extensions/extension_file_util.cc

 // Copyright (c) 2009 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/browser/extensions/extension_file_util.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 210 matching lines @@
     const Extension::PrivacyBlacklistInfo& blacklist =
         extension->privacy_blacklists()[i];
     if (!file_util::PathExists(blacklist.path)) {
       *error = StringPrintf("Could not load '%s' for privacy blacklist.",
                             WideToUTF8(blacklist.path.ToWStringHack()).c_str());
       return false;
     }
   }
 
   // Validate icon location for page actions.
-  const ExtensionAction* page_action = extension->page_action();
+  ExtensionAction2* page_action = extension->page_action();
   if (page_action) {
-    const std::vector<std::string>& icon_paths = page_action->icon_paths();
-    for (std::vector<std::string>::const_iterator iter = icon_paths.begin();
+    std::vector<std::string> icon_paths(*page_action->icon_paths());
+    if (!page_action->default_icon_path().empty())
+      icon_paths.push_back(page_action->default_icon_path());
+    for (std::vector<std::string>::iterator iter = icon_paths.begin();
          iter != icon_paths.end(); ++iter) {
       if (extension->GetResource(*iter).GetFilePath().empty()) {
         *error = StringPrintf("Could not load icon '%s' for page action.",
                               iter->c_str());
         return false;
       }
     }
   }
 
   // Validate icon location for browser actions.
+  // Note: browser actions don't use the icon_paths().
   ExtensionAction2* browser_action = extension->browser_action();
   if (browser_action) {
-    std::vector<std::string>* icon_paths = browser_action->icon_paths();
-    for (std::vector<std::string>::iterator iter = icon_paths->begin();
-         iter != icon_paths->end(); ++iter) {
-      if (extension->GetResource(*iter).GetFilePath().empty()) {
+    std::string default_icon_path = browser_action->default_icon_path();
+    if (!default_icon_path.empty()) {
+      if (extension->GetResource(default_icon_path).GetFilePath().empty()) {
         *error = StringPrintf("Could not load icon '%s' for browser action.",
-                              iter->c_str());
+                              default_icon_path.c_str());
         return false;
       }
     }
   }
 
   // Check children of extension root to see if any of them start with _ and is
   // not on the reserved list.
   if (!CheckForIllegalFilenames(extension->path(), error)) {
     return false;
   }
@@ skipping 136 matching lines @@
         "Filenames starting with \"_\" are reserved for use by the system.",
         filename.c_str());
       return false;
     }
   }
 
   return true;
 }
 
 }  // namespace extension_file_util