Install platform apps into a separate data directory

chrome/browser/extensions/extension_service.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 27 matching lines @@
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_cookies_api.h"
 #include "chrome/browser/extensions/extension_data_deleter.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_global_error.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_input_ime_api.h"
 #include "chrome/browser/extensions/extension_management_api.h"
+#include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_preference_api.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_processes_api.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/extension_sync_data.h"
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extension_webnavigation_api.h"
 #include "chrome/browser/extensions/external_extension_provider_impl.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/child_process_logging.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
@@ skipping 2132 matching lines @@
     RecordPermissionMessagesHistogram(
         extension, "Extensions.Permissions_Install");
   }
 
   extension_prefs_->OnExtensionInstalled(
       extension,
       initial_enable ? Extension::ENABLED : Extension::DISABLED,
       from_webstore,
       page_ordinal);
 
-  // Unpacked extensions default to allowing file access, but if that has been
-  // overridden, don't reset the value.
-  if (Extension::ShouldAlwaysAllowFileAccess(extension->location()) &&
-      !extension_prefs_->HasAllowFileAccessSetting(id)) {
-    extension_prefs_->SetAllowFileAccess(id, true);
+  if (initial_enable && extension->RequiresSeparateUserDataDirectory()) {
+    SetupExtensionPrefsInSeparateDataDirectory(
+        extension, from_webstore, page_ordinal);
   }
 
-  // If the extension should automatically block network startup (e.g., it uses
-  // the webRequest API), set the preference. Otherwise clear it, in case the
-  // extension stopped using a relevant API.
-  extension_prefs_->SetDelaysNetworkRequests(
-      extension->id(), extension->ImplicitlyDelaysNetworkStartup());
-
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile_),
       content::Details<const Extension>(extension));
 
   // Transfer ownership of |extension| to AddExtension.
   AddExtension(scoped_extension);
 }
 
 const Extension* ExtensionService::GetExtensionByIdInternal(
@@ skipping 372 matching lines @@
   //
   // To coexist with certain unit tests that don't have an IO thread message
   // loop available at ExtensionService shutdown, we lazy-initialize this
   // object so that those cases neither create nor destroy a SocketController.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!socket_controller_) {
     socket_controller_ = new extensions::SocketController();
   }
   return socket_controller_;
 }
+
+void ExtensionService::SetupExtensionPrefsInSeparateDataDirectory(
+    const Extension* extension,
+    bool from_webstore,
+    const StringOrdinal& page_ordinal) {
+  const std::string& id = extension->id();
+  FilePath data_dir =
+      web_app::GetWebAppDataDirectory(profile_->GetPath(), *extension);
+  FilePath profile_path = data_dir.AppendASCII(chrome::kInitialProfile);
+  FilePath pref_path = profile_path.Append(chrome::kPreferencesFilename);
+  scoped_ptr<PrefService> prefs_service(PrefService::CreatePrefService(
+      pref_path, NULL, false));
+
+  ExtensionPrefValueMap map;
+  ExtensionPrefs::RegisterUserPrefs(prefs_service.get());
+  ExtensionPrefs extension_prefs(prefs_service.get(), install_directory_, &map);
+  extension_prefs.Init(false);
+  extension_prefs.OnExtensionInstalled(extension,
+                                       Extension::ENABLED,
+                                       from_webstore,
+                                       page_ordinal);
+  extension_prefs.AddGrantedPermissions(id, extension->GetActivePermissions());

[Mihai Parparita -not on Chrome, 2012/02/13 23:29:24]

Is this a (partial) duplication of what CrxInstaller::ReportSuccessFromUIThread
and ExtensionService::AddExtension do? It seems like it'll end up being quite
brittle.

+  extension_prefs.SetExtensionState(id, Extension::ENABLED);
+
+  prefs_service->CommitPendingWrite();
+}