Replace ExtensionAction with ExtensionAction2.

chrome/common/extensions/extension.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/common/extensions/extension.h"
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 279 matching lines @@
       GURL url = GetResourceURL(WideToUTF8(relative));
       ExtensionResource resource = GetResource(WideToUTF8(relative));
       result->css_scripts().push_back(UserScript::File(
           resource.extension_root(), resource.relative_path(), url));
     }
   }
 
   return true;
 }
 
-ExtensionAction2* Extension::LoadExtensionAction2Helper(
+ExtensionAction* Extension::LoadExtensionActionHelper(
     const DictionaryValue* extension_action, std::string* error) {
-  scoped_ptr<ExtensionAction2> result(new ExtensionAction2());
+  scoped_ptr<ExtensionAction> result(new ExtensionAction());
   result->set_extension_id(id());
 
   // Page actions are hidden by default, and browser actions ignore
   // visibility.
-  result->SetIsVisible(ExtensionAction2::kDefaultTabId, false);
+  result->SetIsVisible(ExtensionAction::kDefaultTabId, false);
 
   // TODO(EXTENSIONS_DEPRECATED): icons list is obsolete.
   ListValue* icons = NULL;
   if (extension_action->HasKey(keys::kPageActionIcons) &&
       extension_action->GetList(keys::kPageActionIcons, &icons)) {
     for (ListValue::const_iterator iter = icons->begin();
          iter != icons->end(); ++iter) {
       std::string path;
       if (!(*iter)->GetAsString(&path) || path.empty()) {
         *error = errors::kInvalidPageActionIconPath;
@@ skipping 26 matching lines @@
     result->set_default_icon_path(default_icon);
   }
 
   // Read the page action |default_title|.
   std::string title;
   if (!extension_action->GetString(keys::kName, &title) &&
       !extension_action->GetString(keys::kPageActionDefaultTitle, &title)) {
     *error = errors::kInvalidPageActionDefaultTitle;
     return NULL;
   }
-  result->SetTitle(ExtensionAction2::kDefaultTabId, title);
+  result->SetTitle(ExtensionAction::kDefaultTabId, title);
 
   // Read the action's |popup| (optional).
   DictionaryValue* popup = NULL;
   std::string url_str;
   if (extension_action->HasKey(keys::kPageActionPopup) &&
      !extension_action->GetDictionary(keys::kPageActionPopup, &popup) &&
      !extension_action->GetString(keys::kPageActionPopup, &url_str)) {
     *error = errors::kInvalidPageActionPopup;
     return NULL;
   }
@@ skipping 574 matching lines @@
       return false;
     }
 
     DictionaryValue* page_action_value;
     if (!list_value->GetDictionary(0, &page_action_value)) {
       *error = errors::kInvalidPageAction;
       return false;
     }
 
     page_action_.reset(
-        LoadExtensionAction2Helper(page_action_value, error));
+        LoadExtensionActionHelper(page_action_value, error));
     if (!page_action_.get())
       return false;  // Failed to parse page action definition.
   } else if (source.HasKey(keys::kPageAction)) {
     DictionaryValue* page_action_value;
     if (!source.GetDictionary(keys::kPageAction, &page_action_value)) {
       *error = errors::kInvalidPageAction;
       return false;
     }
 
     page_action_.reset(
-        LoadExtensionAction2Helper(page_action_value, error));
+        LoadExtensionActionHelper(page_action_value, error));
     if (!page_action_.get())
       return false;  // Failed to parse page action definition.
   }
 
   // Initialize browser action (optional).
   if (source.HasKey(keys::kBrowserAction)) {
     // Restrict extensions to one UI surface.
     if (source.HasKey(keys::kPageAction) || source.HasKey(keys::kPageActions)) {
       *error = errors::kOneUISurfaceOnly;
       return false;
     }
 
     DictionaryValue* browser_action_value;
     if (!source.GetDictionary(keys::kBrowserAction, &browser_action_value)) {
       *error = errors::kInvalidBrowserAction;
       return false;
     }
 
     browser_action_.reset(
-        LoadExtensionAction2Helper(browser_action_value, error));
+        LoadExtensionActionHelper(browser_action_value, error));
     if (!browser_action_.get())
       return false;  // Failed to parse browser action definition.
   }
 
   // Initialize the permissions (optional).
   if (source.HasKey(keys::kPermissions)) {
     ListValue* permissions = NULL;
     if (!source.GetList(keys::kPermissions, &permissions)) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kInvalidPermissions, "");
@@ skipping 180 matching lines @@
     UserScript::PatternList::const_iterator pattern =
         content_script->url_patterns().begin();
     for (; pattern != content_script->url_patterns().end(); ++pattern) {
       if (pattern->match_subdomains() && pattern->host().empty())
         return true;
     }
   }
 
   return false;
 }