Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/shell_integration.h

 // 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.
 
 #ifndef CHROME_BROWSER_SHELL_INTEGRATION_H_
 #define CHROME_BROWSER_SHELL_INTEGRATION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 88 matching lines @@
     std::string extension_id;
     bool is_platform_app;
     string16 title;
     string16 description;
     base::FilePath extension_path;
     gfx::ImageFamily favicon;
     base::FilePath profile_path;
     std::string profile_name;
   };
 
+  // For Windows, these refer to "Start Menu", "Start Menu/Google Chrome",
+  // and "Start Menu/Chrome Apps" respectively.

[Elliot Glaysher, 2013/11/25 22:03:03]

Could you please add more documentation about what these do on Linux? I stared
at shell_integration_linux.cc for a while, but I'm not really sure what these do
there...

[calamity, 2013/11/26 02:51:17]

Done. Also changed shell_integration_linux.cc to whitelist implemented
locations.

+  enum ApplicationsMenuLocation {
+    APP_MENU_LOCATION_NONE,
+    APP_MENU_LOCATION_ROOT,
+    APP_MENU_LOCATION_SUBDIR_CHROME,
+    APP_MENU_LOCATION_SUBDIR_CHROMEAPPS,
+  };
+
   // Info about which locations to create app shortcuts in.
   struct ShortcutLocations {
     ShortcutLocations();
 
     bool on_desktop;
-    bool in_applications_menu;
-    string16 applications_menu_subdir;
+
+    ApplicationsMenuLocation applications_menu_location;
 
     // For Windows, this refers to quick launch bar prior to Win7. In Win7,
     // this means "pin to taskbar". For Mac/Linux, this could be used for
     // Mac dock or the gnome/kde application launcher. However, those are not
     // implemented yet.
     bool in_quick_launch_bar;
 
+#if defined(OS_POSIX)
     // For Linux, this refers to a shortcut which the system knows about (for
     // the purpose of identifying windows and giving them the correct
     // title/icon), but which does not show up in menus or search results.
-    // Ignored if in_applications_menu == true.
+    // Ignored if applications_menu_location is not APP_MENU_LOCATION_NONE.
     bool hidden;
+#endif
   };
 
   // Data that needs to be passed between the app launcher stub and Chrome.
   struct AppModeInfo {
   };
   static void SetAppModeInfo(const AppModeInfo* info);
   static const AppModeInfo* AppModeInfo();
 
   // Is the current instance of Chrome running in App mode.
   bool IsRunningInAppMode();
@@ skipping 40 matching lines @@
   // This method is only public for the sake of tests and shouldn't be called
   // externally otherwise.
   static int MigrateShortcutsInPathInternal(const base::FilePath& chrome_exe,
                                             const base::FilePath& path,
                                             bool check_dual_mode);
 
   // Returns the path to the Start Menu shortcut for the given Chrome.
   static base::FilePath GetStartMenuShortcut(const base::FilePath& chrome_exe);
 #endif  // defined(OS_WIN)
 
+#if !defined(OS_WIN)
+  // TODO(calamity): replace with
+  // BrowserDistribution::GetStartMenuShortcutSubfolder() once
+  // BrowserDistribution is cross-platform.
+  // Gets the name of the Chrome Apps menu folder in which to place app
+  // shortcuts. This is needed for Mac and Linux.
+  static base::string16 GetAppShortcutsSubdirName();
+#endif
+
   // The current default web client application UI state. This is used when
   // querying if Chrome is the default browser or the default handler
   // application for a url protocol, and communicates the state and result of
   // a request.
   enum DefaultWebClientUIState {
     STATE_PROCESSING,
     STATE_NOT_DEFAULT,
     STATE_IS_DEFAULT,
     STATE_UNKNOWN
   };
@@ skipping 128 matching lines @@
     // Set Chrome as the default handler for this protocol.
     virtual bool SetAsDefault(bool interactive_permitted) OVERRIDE;
 
     std::string protocol_;
 
     DISALLOW_COPY_AND_ASSIGN(DefaultProtocolClientWorker);
   };
 };
 
 #endif  // CHROME_BROWSER_SHELL_INTEGRATION_H_