Mac app mode: locate Chrome + refactor

chrome/common/mac/app_mode_common.h

Index: chrome/common/mac/app_mode_common.h
diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h
index 4fd258ca9c940720691fad35482ca768d50c7298..31534666e19e05245b0cba2e5c52dc071873bc12 100644
--- a/chrome/common/mac/app_mode_common.h
+++ b/chrome/common/mac/app_mode_common.h
@@ -8,6 +8,9 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
+#include "base/file_path.h"
+#include "base/string16.h"
+
 // This file contains constants, interfaces, etc. which are common to the
 // browser application and the app mode loader (a.k.a. shim).
 
@@ -32,6 +35,10 @@ const unsigned kCurrentChromeAppModeInfoMinorVersion = 0;
 // version number. It may refuse to load if the major version of the structure
 // is different from the one it accepts.
 struct ChromeAppModeInfo {

[Mark Mentovai, 2012/02/07 17:28:06]

Should this be a class now?

Should you provide getters and setters instead of allowing unrestricted data
access?

[jeremy, 2012/02/09 10:52:51]

This code is due for a big refactor, and I'll likely remove this struct or
change it pretty heavily.  Hope it's ok to keep as is for now.

+ public:
+  ChromeAppModeInfo();
+  virtual ~ChromeAppModeInfo();

[Mark Mentovai, 2012/02/07 17:28:06]

There doesn’t appear to be any need for this to be virtual.

[jeremy, 2012/02/09 10:52:51]

Done.

+
   // Major and minor version number of this structure.
   unsigned major_version;  // Required: all versions
   unsigned minor_version;  // Required: all versions
@@ -41,25 +48,25 @@ struct ChromeAppModeInfo {
   char** argv;  // Required: v1.0
 
   // Versioned path to the browser which is being loaded.
-  char* chrome_versioned_path;  // Required: v1.0
+  FilePath chrome_versioned_path;  // Required: v1.0
 
   // Information about the App Mode shortcut:
 
   // Path to the App Mode Loader application bundle originally run.
-  char* app_mode_bundle_path;  // Optional: v1.0
+  FilePath app_mode_bundle_path;  // Optional: v1.0
 
   // Short ID string, preferably derived from |app_mode_short_name|. Should be
   // safe for the file system.
-  char* app_mode_id;  // Required: v1.0
+  std::string app_mode_id;  // Required: v1.0
 
   // Short (e.g., one-word) UTF8-encoded name for the shortcut.
-  char* app_mode_short_name;  // Optional: v1.0
+  string16 app_mode_short_name;  // Optional: v1.0
 
   // Unrestricted (e.g., several-word) UTF8-encoded name for the shortcut.
-  char* app_mode_name;  // Optional: v1.0
+  string16 app_mode_name;  // Optional: v1.0
 
   // URL for the shortcut. Must be a valid URL.
-  char* app_mode_url;  // Required: v1.0
+  std::string app_mode_url;  // Required: v1.0
 };
 
 }  // namespace app_mode