Move the parsing of app.launch related keys out of Extension class.

chrome/common/extensions/extension.h

 // Copyright (c) 2013 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_
 
 #include <algorithm>
 #include <iosfwd>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/file_path.h"
-#include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
@@ skipping 13 matching lines @@
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace gfx {
 class ImageSkia;
 }
 
-FORWARD_DECLARE_TEST(TabStripModelTest, Apps);
-
 namespace extensions {
 struct ActionInfo;
 class APIPermissionSet;
 class PermissionSet;
 
 // Represents a Chrome extension.
 class Extension : public base::RefCountedThreadSafe<Extension> {
  public:
   struct ManifestData;
 
@@ skipping 329 matching lines @@
 
   // Returns a list of paths (relative to the extension dir) for images that
   // the browser might load (like themes and page action icons).
   std::set<base::FilePath> GetBrowserImages() const;
 
   // Get an extension icon as a resource or URL.
   ExtensionResource GetIconResource(
       int size, ExtensionIconSet::MatchType match_type) const;
   GURL GetIconURL(int size, ExtensionIconSet::MatchType match_type) const;
 
-  // Gets the fully resolved absolute launch URL.
-  GURL GetFullLaunchURL() const;
-
   // Returns true if this extension can execute script on a page. If a
   // UserScript object is passed, permission to run that specific script is
   // checked (using its matches list). Otherwise, permission to execute script
   // programmatically is checked (using the extension's host permission).
   //
   // This method is also aware of certain special pages that extensions are
   // usually not allowed to run script on.
   bool CanExecuteScriptOnPage(const GURL& document_url,
                               const GURL& top_document_url,
                               int tab_id,
@@ skipping 143 matching lines @@
   bool is_app() const {
     return is_legacy_packaged_app() || is_hosted_app() || is_platform_app();
   }
   bool is_platform_app() const;
   bool is_hosted_app() const;
   bool is_legacy_packaged_app() const;
   bool is_extension() const;
   bool is_storage_isolated() const { return is_storage_isolated_; }
   bool can_be_incognito_enabled() const;
   void AddWebExtentPattern(const URLPattern& pattern);
+  void ClearWebExtentPatterns();
   const URLPatternSet& web_extent() const { return extent_; }
-  const std::string& launch_local_path() const { return launch_local_path_; }
-  const std::string& launch_web_url() const { return launch_web_url_; }
-  extension_misc::LaunchContainer launch_container() const {
-    return launch_container_;
-  }
-  int launch_width() const { return launch_width_; }
-  int launch_height() const { return launch_height_; }
 
   // Theme-related.
   bool is_theme() const;
 
   // Content pack related.
   bool is_content_pack() const;
   ExtensionResource GetContentPackSiteList() const;
 
   GURL GetBackgroundURL() const;
 
@@ skipping 61 matching lines @@
   bool LoadRequiredFeatures(string16* error);
   bool LoadName(string16* error);
   bool LoadVersion(string16* error);
 
   bool LoadAppFeatures(string16* error);
   bool LoadExtent(const char* key,
                   URLPatternSet* extent,
                   const char* list_error,
                   const char* value_error,
                   string16* error);
-  bool LoadLaunchContainer(string16* error);
-  bool LoadLaunchURL(string16* error);
 
   bool LoadSharedFeatures(string16* error);
   bool LoadDescription(string16* error);
   bool LoadManifestVersion(string16* error);
   bool LoadIcons(string16* error);
   bool LoadPlugins(string16* error);
   bool LoadNaClModules(string16* error);
   bool LoadSandboxedPages(string16* error);
   // Must be called after LoadPlugins().
   bool LoadRequirements(string16* error);
@@ skipping 32 matching lines @@
                        int content_script_index,
                        const char* globs_property_name,
                        string16* error,
                        void(UserScript::*add_method)(const std::string& glob),
                        UserScript* instance);
 
   // Returns true if the extension has more than one "UI surface". For example,
   // an extension that has a browser action and a page action.
   bool HasMultipleUISurfaces() const;
 
-  // Updates the launch URL and extents for the extension using the given
-  // |override_url|.
-  void OverrideLaunchUrl(const GURL& override_url);
-
   // Custom checks for the experimental permission that can't be expressed in
   // _permission_features.json.
   bool CanSpecifyExperimentalPermission() const;
 
   // Checks whether the host |pattern| is allowed for this extension, given API
   // permissions |permissions|.
   bool CanSpecifyHostPermission(const URLPattern& pattern,
                                 const APIPermissionSet& permissions) const;
 
   bool CheckMinimumChromeVersion(string16* error) const;
@@ skipping 126 matching lines @@
   bool finished_parsing_manifest_;
 
   // Ensures that any call to GetManifestData() prior to finishing
   // initialization happens from the same thread (this can happen when certain
   // parts of the initialization process need information from previous parts).
   base::ThreadChecker thread_checker_;
 
   // Whether this extension requests isolated storage.
   bool is_storage_isolated_;
 
-  // The local path inside the extension to use with the launcher.
-  std::string launch_local_path_;
-
-  // A web url to use with the launcher. Note that this might be relative or
-  // absolute. If relative, it is relative to web_origin.
-  std::string launch_web_url_;
-
-  // The window type that an app's manifest specifies to launch into.
-  // This is not always the window type an app will open into, because
-  // users can override the way each app launches.  See
-  // ExtensionPrefs::GetLaunchContainer(), which looks at a per-app pref
-  // to decide what container an app will launch in.
-  extension_misc::LaunchContainer launch_container_;
-
-  // The default size of the container when launching. Only respected for
-  // containers like panels and windows.
-  int launch_width_;
-  int launch_height_;
-
   // Should this app be shown in the app launcher.
   bool display_in_launcher_;
 
   // Should this app be shown in the browser New Tab Page.
   bool display_in_new_tab_page_;
 
   // Whether the extension has host permissions or user script patterns that
   // imply access to file:/// scheme URLs (the user may not have actually
   // granted it that access).
   bool wants_file_access_;
 
   // The flags that were passed to InitFromValue.
   int creation_flags_;
 
-  FRIEND_TEST_ALL_PREFIXES(::TabStripModelTest, Apps);
-
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };
 
 typedef std::vector<scoped_refptr<const Extension> > ExtensionList;
 typedef std::set<std::string> ExtensionIdSet;
 typedef std::vector<std::string> ExtensionIdList;
 
 // Handy struct to pass core extension info around.
 struct ExtensionInfo {
   ExtensionInfo(const base::DictionaryValue* manifest,
@@ skipping 44 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_