Merge 48149 - Relanding 48042....

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_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 191 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 explictly turned on via a command line switch).
+  static bool AppsAreEnabled();
+
   // Initialize the extension from a parsed manifest.
   // Usually, the id of an extension is generated by the "key" property of
   // its manifest, but if |require_key| is |false|, a temporary ID will be
   // generated based on the path.
   bool InitFromValue(const DictionaryValue& value, bool require_key,
                      std::string* error);
 
   const FilePath& path() const { return path_; }
   void set_path(const FilePath& path) { path_ = path; }
   const GURL& url() const { return extension_url_; }
@@ skipping 332 matching lines @@
   scoped_ptr<DictionaryValue> extension_manifest;
   std::string extension_id;
   FilePath extension_path;
   Extension::Location extension_location;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionInfo);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_