Add user data dir field to Mac platform apps

chrome/browser/web_applications/web_app.h

Index: chrome/browser/web_applications/web_app.h
diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h
index 67c839e773f66c8ff032d72f025a325375590d68..0554f5cdc7ea6eaf5a2588c6f2e1ebad75d98525 100644
--- a/chrome/browser/web_applications/web_app.h
+++ b/chrome/browser/web_applications/web_app.h
@@ -14,8 +14,20 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/web_apps.h"
 
+class Extension;
+
 namespace web_app {
 
+// Returns data directory for given web app url.
+FilePath GetWebAppDataDirectory(const FilePath& profile_path,
+                                const std::string& extension_id,

[Mihai Parparita -not on Chrome, 2012/02/21 20:53:21]

Rather than the two overloaded variants of GetWebAppDataDirectory, can you go
back to the one that takes a ShortcutInfo instead? That struct already has
comments about the precedence of extension_id vs. URL (which otherwise you'd
have to repeat here).

[sail, 2012/02/22 22:10:08]

I added a comment explaining how |extension_id| and |url| are used to create the
path.

I don't think using ShortcutInfo is useful for two reasons:
  - ShortcutInfo has many fields and it wouldn't be clear which fields need to
be filled in to call this function
  - the comment in ShortcutInfo is about the Windows app id which isn't the same
as the profile directory path (the url is concatenated differently).

+                                const GURL& url);
+
+// Gets the user data directory to use for |extension| located inside the
+// directory for |profile|.

[Mihai Parparita -not on Chrome, 2012/02/21 20:53:21]

Nit: Should this be |profile_path| instead?

[sail, 2012/02/22 22:10:08]

Done.

+FilePath GetWebAppDataDirectory(const FilePath& profile_path,
+                                const Extension& extension);
+
 // Compute a deterministic name based on data in the shortcut_info.
 std::string GenerateApplicationNameFromInfo(
     const ShellIntegration::ShortcutInfo& shortcut_info);
@@ -43,9 +55,6 @@ void CreateShortcut(
 // Returns true if given url is a valid web app url.
 bool IsValidUrl(const GURL& url);
 
-// Returns data dir for web apps for given profile path.
-FilePath GetDataDir(const FilePath& profile_path);
-
 #if defined(TOOLKIT_VIEWS)
 // Extracts icons info from web app data. Take only square shaped icons and
 // sort them from smallest to largest.
@@ -67,9 +76,6 @@ namespace internals {
 bool CheckAndSaveIcon(const FilePath& icon_file, const SkBitmap& image);
 #endif
 
-FilePath GetWebAppDataDirectory(const FilePath& root_dir,
-                                const ShellIntegration::ShortcutInfo& info);
-
 // Does the actual job of creating a shortcut (see CreateShortcut() above).
 // This must be called on the file thread.
 void CreateShortcutTask(const FilePath& web_app_path,