Install platform apps into a separate data directory

chrome/browser/web_applications/web_app.cc

 // 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.
 
 #include "chrome/browser/web_applications/web_app.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Allow tests to disable shortcut creation, to prevent developers desktops
 // becoming overrun with shortcuts.
 bool disable_shortcut_creation_for_tests = false;
 
 // Returns relative directory of given web app url.
-FilePath GetWebAppDir(const ShellIntegration::ShortcutInfo& info) {
-  if (!info.extension_id.empty()) {
+FilePath GetWebAppDir(const std::string& extension_id, const GURL& url) {
+  if (!extension_id.empty()) {
     std::string app_name =
-        web_app::GenerateApplicationNameFromExtensionId(info.extension_id);
+        web_app::GenerateApplicationNameFromExtensionId(extension_id);
 #if defined(OS_WIN)
     return FilePath(UTF8ToWide(app_name));
 #elif defined(OS_POSIX)
     return FilePath(app_name);
 #endif
   } else {
     FilePath::StringType host;
     FilePath::StringType scheme_port;
 
 #if defined(OS_WIN)
-    host = UTF8ToWide(info.url.host());
-    scheme_port = (info.url.has_scheme() ? UTF8ToWide(info.url.scheme())
+    host = UTF8ToWide(url.host());
+    scheme_port = (url.has_scheme() ? UTF8ToWide(url.scheme())
         : L"http") + FILE_PATH_LITERAL("_") +
-        (info.url.has_port() ? UTF8ToWide(info.url.port()) : L"80");
+        (url.has_port() ? UTF8ToWide(url.port()) : L"80");
 #elif defined(OS_POSIX)
-    host = info.url.host();
-    scheme_port = info.url.scheme() + FILE_PATH_LITERAL("_") + info.url.port();
+    host = url.host();
+    scheme_port = url.scheme() + FILE_PATH_LITERAL("_") + url.port();
 #endif
 
     return FilePath(host).Append(scheme_port);
   }
 }
 
 #if defined(TOOLKIT_VIEWS)
 // Predicator for sorting images from largest to smallest.
 bool IconPrecedes(const WebApplicationInfo::IconInfo& left,
                   const WebApplicationInfo::IconInfo& right) {
   return left.width < right.width;
 }
 #endif
 
 }  // namespace
 
 namespace web_app {
 
 // The following string is used to build the directory name for
 // shortcuts to chrome applications (the kind which are installed
 // from a CRX).  Application shortcuts to URLs use the {host}_{path}
 // for the name of this directory.  Hosts can't include an underscore.
 // By starting this string with an underscore, we ensure that there
 // are no naming conflicts.
 static const char* kCrxAppPrefix = "_crx_";
 
 namespace internals {
 
-// Returns data directory for given web app url
-FilePath GetWebAppDataDirectory(const FilePath& root_dir,
-                                const ShellIntegration::ShortcutInfo& info) {
-  return root_dir.Append(GetWebAppDir(info));
-}
-
 FilePath GetSanitizedFileName(const string16& name) {
 #if defined(OS_WIN)
   string16 file_name = name;
 #else
   std::string file_name = UTF16ToUTF8(name);
 #endif
   file_util::ReplaceIllegalCharactersInPath(&file_name, '_');
   return FilePath(file_name);
 }
 
 }  // namespace internals
 
+FilePath GetWebAppDataDirectory(const FilePath& profile_path,
+                                const std::string& extension_id,
+                                const GURL& url) {
+  return GetDataDir(profile_path).Append(GetWebAppDir(extension_id, url));
+}
+
 std::string GenerateApplicationNameFromInfo(
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   if (!shortcut_info.extension_id.empty()) {
     return web_app::GenerateApplicationNameFromExtensionId(
         shortcut_info.extension_id);
   } else {
     return web_app::GenerateApplicationNameFromURL(
         shortcut_info.url);
   }
 }
@@ skipping 22 matching lines @@
 void CreateShortcut(
     const FilePath& data_dir,
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   if (disable_shortcut_creation_for_tests)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&internals::CreateShortcutTask,
-                 web_app::internals::GetWebAppDataDirectory(
-                    web_app::GetDataDir(data_dir),
-                    shortcut_info),
+                 GetWebAppDataDirectory(
+                    data_dir,
+                    shortcut_info.extension_id,
+                    shortcut_info.url),
                  data_dir,
                  shortcut_info));
 }
 
 void SetDisableShortcutCreationForTests(bool disable) {
   disable_shortcut_creation_for_tests = disable;
 }
 
 bool IsValidUrl(const GURL& url) {
   static const char* const kValidUrlSchemes[] = {
@@ skipping 35 matching lines @@
 
 #if defined(TOOLKIT_USES_GTK)
 std::string GetWMClassFromAppName(std::string app_name) {
   file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
   TrimString(app_name, "_", &app_name);
   return app_name;
 }
 #endif
 
 }  // namespace web_app