Clean up comments from r134097.

chrome/common/extensions/extension.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #pragma once
 
 #include <algorithm>
 #include <map>
@@ skipping 559 matching lines @@
   const std::string& non_localized_name() const { return non_localized_name_; }
   const std::string public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   int manifest_version() const { return manifest_version_; }
   bool converted_from_user_script() const {
     return converted_from_user_script_;
   }
   const UserScriptList& content_scripts() const { return content_scripts_; }
   ExtensionAction* page_action() const { return page_action_.get(); }
   ExtensionAction* browser_action() const { return browser_action_.get(); }
-  ExtensionAction::Type extension_action_api_type() const {
-    return extension_action_api_type_;
+  ExtensionAction::Type declared_action_type() const {
+    return declared_action_type_;
   }
   const FileBrowserHandlerList* file_browser_handlers() const {
     return file_browser_handlers_.get();
   }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const std::vector<NaClModuleInfo>& nacl_modules() const {
     return nacl_modules_;
   }
   const std::vector<InputComponentInfo>& input_components() const {
     return input_components_;
@@ skipping 333 matching lines @@
 
   // Paths to the content scripts the extension contains.
   UserScriptList content_scripts_;
 
   // The extension's page action, if any.
   scoped_ptr<ExtensionAction> page_action_;
 
   // The extension's browser action, if any.
   scoped_ptr<ExtensionAction> browser_action_;
 
-  // The "API type" of whichever extension action (|page_action_| or
-  // |browser_action_|) refers to. This flag is needed by code which must deal
-  // with browser actions that were automatically converted from page actions,
-  // since the extensions will still call the pageAction APIs.
-  ExtensionAction::Type extension_action_api_type_;
+  // Indicates the type of action (browser or page) that the extension declared
+  // in its manifest. This doesn't imply any value for page_action or
+  // browser_action, since page actions may be turned into browser actions and
+  // browser actions may be generated without any action declared.
+  ExtensionAction::Type declared_action_type_;

[koz (OOO until 15th September), 2012/04/30 05:23:18]

Much nicer, cheers.

 
   // The extension's file browser actions, if any.
   scoped_ptr<FileBrowserHandlerList> file_browser_handlers_;
 
   // Optional list of NPAPI plugins and associated properties.
   std::vector<PluginInfo> plugins_;
 
   // Optional list of NaCl modules and associated properties.
   std::vector<NaClModuleInfo> nacl_modules_;
 
@@ skipping 173 matching lines @@
   // only contain the removed permissions.
   const ExtensionPermissionSet* permissions;
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const ExtensionPermissionSet* permissions,
       Reason reason);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_