Implement new strategy for default apps

chrome/common/extensions/extension.h

 // Copyright (c) 2010 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 <map>
 #include <set>
@@ skipping 140 matching lines @@
   std::vector<string16> GetPermissionMessages();
 
   // Returns the distinct hosts that should be displayed in the install UI. This
   // discards some of the detail that is present in the manifest to make it as
   // easy as possible to process by users. In particular we disregard the scheme
   // and path components of URLPatterns and de-dupe the result.
   static std::vector<std::string> GetDistinctHosts(
       const URLPatternList& host_patterns);
   std::vector<std::string> GetDistinctHosts();
 
-  bool apps_enabled() const { return apps_enabled_; }
-  void set_apps_enabled(bool val) { apps_enabled_ = val; }
-
   // Icon sizes used by the extension system.
   static const int kIconSizes[];
 
   // Max size (both dimensions) for browser and page actions.
   static const int kPageActionIconMaxSize;
   static const int kBrowserActionIconMaxSize;
 
   // Each permission is a module that the extension is permitted to use.
   //
   // NOTE: To add a new permission, define it here, and add an entry to
@@ skipping 120 matching lines @@
   // result. In the browser process, this will DCHECK if not called on the
   // file thread. To easily load extension images on the UI thread, see
   // ImageLoadingTracker.
   static void DecodeIconFromPath(const FilePath& icon_path,
                                  Icons icon_size,
                                  scoped_ptr<SkBitmap>* result);
 
   // Returns the base extension url for a given |extension_id|.
   static GURL GetBaseURLFromExtensionId(const std::string& extension_id);
 
-  // Returns whether the browser has apps enabled (either as the default or if
-  // it was explicitly turned on via a command line switch).
-  static bool AppsAreEnabled();
-
-  // Returns the launch URL for the extension/apps gallery. Can be set via the
+  // Returns the url prefix for the extension/apps gallery. Can be set via the
   // --apps-gallery-url switch. The URL returned will not contain a trailing
   // slash. Do not use this as a prefix/extent for the store.  Instead see
   // ExtensionsService::GetWebStoreApp or
   // ExtensionsService::IsDownloadFromGallery
   static std::string ChromeStoreLaunchURL();
 
   // Helper function that consolidates the check for whether the script can
   // execute into one location. |page_url| is the page that is the candidate
   // for running the script, |can_execute_script_everywhere| specifies whether
   // the extension is on the whitelist, |allowed_pages| is a vector of
@@ skipping 306 matching lines @@
   // URL for fetching an update manifest
   GURL update_url_;
 
   // A copy of the manifest that this extension was created from.
   scoped_ptr<DictionaryValue> manifest_value_;
 
   // A map of chrome:// hostnames (newtab, downloads, etc.) to Extension URLs
   // which override the handling of those URLs.
   URLOverrideMap chrome_url_overrides_;
 
-  // Whether apps-related features can be parsed during InitFromValue().
-  // Defaults to the value from --enable-extension-apps.
-  bool apps_enabled_;
-
   // Whether this extension uses app features.
   bool is_app_;
 
   // 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_;
 
@@ skipping 19 matching lines @@
   // True while the extension is being upgraded.
   bool being_upgraded_;
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionTest, LoadPageActionHelper);
   FRIEND_TEST_ALL_PREFIXES(TabStripModelTest, Apps);
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };
 
 typedef std::vector<Extension*> ExtensionList;
+typedef std::set<std::string> ExtensionIdSet;
 
 // Handy struct to pass core extension info around.
 struct ExtensionInfo {
   ExtensionInfo(const DictionaryValue* manifest,
                 const std::string& id,
                 const FilePath& path,
                 Extension::Location location);
   ~ExtensionInfo();
 
   scoped_ptr<DictionaryValue> extension_manifest;
@@ skipping 15 matching lines @@
   std::set<std::string> extension_api_permissions;
   // TODO(akalin): Once we have a unified ExtensionType, replace the
   // below member variables with a member of that type.
   bool is_theme;
   bool is_app;
   bool converted_from_user_script;
   GURL update_url;
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_