Enable experimental permissions for extensions from the store.

chrome/browser/extensions/crx_installer.h

 // Copyright (c) 2011 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_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 119 matching lines @@
   void set_expected_version(const Version& val) {
     expected_version_.reset(val.Clone());
   }
 
   bool delete_source() const { return delete_source_; }
   void set_delete_source(bool val) { delete_source_ = val; }
 
   bool allow_silent_install() const { return allow_silent_install_; }
   void set_allow_silent_install(bool val) { allow_silent_install_ = val; }
 
-  bool is_gallery_install() const { return is_gallery_install_; }
-  void set_is_gallery_install(bool val) { is_gallery_install_ = val; }
+  bool is_gallery_install() const {
+    return creation_flags_ & Extension::FROM_WEBSTORE;

[Matt Perry, 2011/10/31 18:55:14]

was this a functional change, or just a cleanup?

[Aaron Boodman, 2011/10/31 20:04:12]

The overall change is a functional addition. The previous attempt to allow store
extensions to specify experimental permissions did not work because
FROM_WEBSTORE was not passed down into ExtensionUnpacker.

In this particular case, I didn't like the fact that we were essentially storing
is_gallery_install() two ways (the boolean flag and the bit in creation_flags),
so I combined them.

+  }
+  void set_is_gallery_install(bool val) {
+    if (val) creation_flags_ |= Extension::FROM_WEBSTORE;
+    else creation_flags_ &= ~Extension::FROM_WEBSTORE;
+  }
 
   // The original download URL should be set when the WebstoreInstaller is
   // tracking the installation. The WebstoreInstaller uses this URL to match
   // failure notifications to the extension.
   const GURL& original_download_url() const { return original_download_url_; }
   void set_original_download_url(const GURL& url) {
     original_download_url_ = url;
   }
 
   // If |apps_require_extension_mime_type_| is set to true, be sure to set
@@ skipping 88 matching lines @@
 
   // Whether manual extension installation is enabled. We can't just check this
   // before trying to install because themes are special-cased to always be
   // allowed.
   bool extensions_enabled_;
 
   // Whether we're supposed to delete the source file on destruction. Defaults
   // to false.
   bool delete_source_;
 
-  // Whether the install originated from the gallery.
-  bool is_gallery_install_;
-
   // The download URL, before redirects, if this is a gallery install.
   GURL original_download_url_;
 
   // Whether to create an app shortcut after successful installation. This is
   // set based on the user's selection in the UI and can only ever be true for
   // apps.
   bool create_app_shortcut_;
 
   // The extension we're installing. We own this and either pass it off to
   // ExtensionService on success, or delete it on failure.
@@ skipping 53 matching lines @@
   extension_misc::CrxInstallCause install_cause_;
 
   // Creation flags to use for the extension.  These flags will be used
   // when calling Extenion::Create() by the crx installer.
   int creation_flags_;
 
   DISALLOW_COPY_AND_ASSIGN(CrxInstaller);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_