Mac: Generate App Mode Loader bundle + cleanup

chrome/browser/web_applications/web_app_mac.h

Index: chrome/browser/web_applications/web_app_mac.h
diff --git a/chrome/browser/web_applications/web_app_mac.h b/chrome/browser/web_applications/web_app_mac.h
index 261b9d724a4f00e48b7dc11546a6325f8aae60bd..51620dd1b178ef1f55f93cb932ddccbce25ab8b3 100644
--- a/chrome/browser/web_applications/web_app_mac.h
+++ b/chrome/browser/web_applications/web_app_mac.h
@@ -7,8 +7,17 @@
 #pragma once
 
 #include "base/file_path.h"
+#include "base/string16.h"
 #include "chrome/browser/shell_integration.h"
 
+#ifdef __OBJC__
+@class NSDictionary;
+@class NSString;
+#else  // __OBJC__
+class NSDictionary;
+class NSString;
+#endif  // __OBJC__
+
 namespace web_app {
 
 // Creates a shortcut for a web application. The shortcut is a stub app
@@ -16,11 +25,14 @@ namespace web_app {
 class WebAppShortcutCreator {
  public:
   // Creates a new shortcut based on information in |shortcut_info|.
-  explicit WebAppShortcutCreator(
-      const ShellIntegration::ShortcutInfo& shortcut_info);
+  // |chrome_bundle_id| is the CFBundleIdentifier of the Chrome browser bundle.
+  WebAppShortcutCreator(
+      const ShellIntegration::ShortcutInfo& shortcut_info,
+      const string16& chrome_bundle_id);
   virtual ~WebAppShortcutCreator();
 
-  // Creates a shortcut.
+  // Copies the app launcher template into place and fills in all relevant
+  // information.
   bool CreateShortcut();
 
  protected:
@@ -37,8 +49,16 @@ class WebAppShortcutCreator {
   bool UpdateIcon(const FilePath& app_path) const;
 
  private:
+  // Returns the bundle identifier to use for this app bundle.
+  // |plist| is a dictionary containg a copy of the template plist file to
+  // be used for creating the app bundle.
+  NSString* GetBundleIdentifier(NSDictionary* plist) const;
+
   // Information about the app.
   ShellIntegration::ShortcutInfo info_;
+
+  // The CFBundleIdentifier of the Chrome browser bundle.
+  string16 chrome_bundle_id_;
 };
 
 }  // namespace web_app