support loading pepper flash debugger dlls

chrome/common/chrome_paths.h

Index: chrome/common/chrome_paths.h
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h
index d99aef5b2a8f8c75ed3d84cecc5a6c959b1eb1df..249a1ee53e10e69144408d5d24993fa7e05ab75d 100644
--- a/chrome/common/chrome_paths.h
+++ b/chrome/common/chrome_paths.h
@@ -18,24 +18,23 @@ namespace chrome {
 
 enum {
   PATH_START = 1000,
-
-  DIR_APP = PATH_START,         // Directory where dlls and data reside.
-  DIR_LOGS,                     // Directory where logs should be written.
-  DIR_USER_DATA,                // Directory where user data can be written.
-  DIR_CRASH_DUMPS,              // Directory where crash dumps are written.
-  DIR_RESOURCES,                // Directory containing separate file resources
-                                // used by Chrome at runtime.
-  DIR_INSPECTOR,                // Directory where web inspector is located.
-  DIR_APP_DICTIONARIES,         // Directory where the global dictionaries are.
-  DIR_USER_DOCUMENTS,           // Directory for a user's "My Documents".
-  DIR_USER_MUSIC,               // Directory for a user's music.
-  DIR_USER_PICTURES,            // Directory for a user's pictures.
-  DIR_USER_VIDEOS,              // Directory for a user's videos.
-  DIR_DEFAULT_DOWNLOADS_SAFE,   // Directory for a user's
-                                // "My Documents/Downloads", (Windows) or
-                                // "Downloads". (Linux)
-  DIR_DEFAULT_DOWNLOADS,        // Directory for a user's downloads.
-  DIR_INTERNAL_PLUGINS,         // Directory where internal plugins reside.
+  DIR_APP = PATH_START,        // Directory where dlls and data reside.

[jam, 2014/04/28 17:47:38]

nit: Please undo all the spacing changes to this file. i see you made it so that
each section has two spaces from the longest constant to the comment, but this
isn't maintainable because if someone adds a longer string, to do what you did
would involved changing all the lines (it also makes blaming a line harder)

[luken, 2014/04/28 17:57:16]

Will do. git cl format did this, I'll clean it up.

+  DIR_LOGS,                    // Directory where logs should be written.
+  DIR_USER_DATA,               // Directory where user data can be written.
+  DIR_CRASH_DUMPS,             // Directory where crash dumps are written.
+  DIR_RESOURCES,               // Directory containing separate file resources
+                               // used by Chrome at runtime.
+  DIR_INSPECTOR,               // Directory where web inspector is located.
+  DIR_APP_DICTIONARIES,        // Directory where the global dictionaries are.
+  DIR_USER_DOCUMENTS,          // Directory for a user's "My Documents".
+  DIR_USER_MUSIC,              // Directory for a user's music.
+  DIR_USER_PICTURES,           // Directory for a user's pictures.
+  DIR_USER_VIDEOS,             // Directory for a user's videos.
+  DIR_DEFAULT_DOWNLOADS_SAFE,  // Directory for a user's
+                               // "My Documents/Downloads", (Windows) or
+                               // "Downloads". (Linux)
+  DIR_DEFAULT_DOWNLOADS,       // Directory for a user's downloads.
+  DIR_INTERNAL_PLUGINS,        // Directory where internal plugins reside.
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   DIR_POLICY_FILES,             // Directory for system-wide read-only
                                 // policy files that allow sys-admins
@@ -43,10 +42,10 @@ enum {
                                 // contains subdirectories.
 #endif
 #if defined(OS_MACOSX) && !defined(OS_IOS)
-  DIR_MANAGED_PREFS,            // Directory that stores the managed prefs plist
-                                // files for the current user.
-  DIR_USER_APPLICATIONS,        // ~/Applications
-  DIR_USER_LIBRARY,             // ~/Library
+  DIR_MANAGED_PREFS,      // Directory that stores the managed prefs plist
+                          // files for the current user.
+  DIR_USER_APPLICATIONS,  // ~/Applications
+  DIR_USER_LIBRARY,       // ~/Library
 #endif
 #if defined(OS_CHROMEOS) || (defined(OS_MACOSX) && !defined(OS_IOS))
   DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
@@ -61,47 +60,47 @@ enum {
                                        // describe extensions which are to be
                                        // installed when chrome is run.
 #endif
-  DIR_EXTERNAL_EXTENSIONS,      // Directory where installer places .crx files.
-
-  DIR_DEFAULT_APPS,             // Directory where installer places .crx files
-                                // to be installed when chrome is first run.
-  DIR_PEPPER_FLASH_PLUGIN,      // Directory to the bundled Pepper Flash plugin,
-                                // containing the plugin and the manifest.
+  DIR_EXTERNAL_EXTENSIONS,  // Directory where installer places .crx files.
+  DIR_DEFAULT_APPS,         // Directory where installer places .crx files
+                            // to be installed when chrome is first run.
+  DIR_PEPPER_FLASH_PLUGIN,  // Directory to the bundled Pepper Flash plugin,
+                            // containing the plugin and the manifest.
   DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN,  // Base directory of the Pepper
                                               // Flash plugins downloaded by the
                                               // component updater.
-  FILE_RESOURCE_MODULE,         // Full path and filename of the module that
-                                // contains embedded resources (version,
-                                // strings, images, etc.).
-  FILE_LOCAL_STATE,             // Path and filename to the file in which
-                                // machine/installation-specific state is saved.
-  FILE_RECORDED_SCRIPT,         // Full path to the script.log file that
-                                // contains recorded browser events for
-                                // playback.
-  FILE_FLASH_PLUGIN,            // Full path to the internal NPAPI Flash plugin
-                                // file. Querying this path will succeed no
-                                // matter the file exists or not.
-  FILE_PEPPER_FLASH_PLUGIN,     // Full path to the bundled Pepper Flash plugin
-                                // file.
-  FILE_PDF_PLUGIN,              // Full path to the internal PDF plugin file.
-
-  FILE_NACL_PLUGIN,             // Full path to the internal NaCl plugin file.
-  DIR_PNACL_BASE,               // Full path to the base dir for PNaCl.
-  DIR_PNACL_COMPONENT,          // Full path to the latest PNaCl version
-                                // (subdir of DIR_PNACL_BASE).
-  FILE_O1D_PLUGIN,              // Full path to the O1D Pepper plugin file.
-  FILE_EFFECTS_PLUGIN,          // Full path to the Effects Pepper plugin file.
-  FILE_GTALK_PLUGIN,            // Full path to the GTalk Pepper plugin file.
-  DIR_COMPONENT_WIDEVINE_CDM,   // Directory that contains component-updated
-                                // Widevine CDM files.
-  FILE_WIDEVINE_CDM_ADAPTER,    // Full path to the Widevine CDM adapter file.
-  FILE_RESOURCES_PACK,          // Full path to the .pak file containing
-                                // binary data (e.g., html files and images
-                                // used by internal pages).
-  DIR_RESOURCES_EXTENSION,      // Full path to extension resources.
+  DIR_PEPPER_FLASH_DEBUGGER_PLUGIN,  // Base directory of the debugging version
+                                     // of the Pepper Flash plugin.
+  FILE_RESOURCE_MODULE,        // Full path and filename of the module that
+                               // contains embedded resources (version,
+                               // strings, images, etc.).
+  FILE_LOCAL_STATE,            // Path and filename to the file in which
+                               // machine/installation-specific state is saved.
+  FILE_RECORDED_SCRIPT,        // Full path to the script.log file that
+                               // contains recorded browser events for
+                               // playback.
+  FILE_FLASH_PLUGIN,           // Full path to the internal NPAPI Flash plugin
+                               // file. Querying this path will succeed no
+                               // matter the file exists or not.
+  FILE_PEPPER_FLASH_PLUGIN,    // Full path to the bundled Pepper Flash plugin
+                               // file.
+  FILE_PDF_PLUGIN,             // Full path to the internal PDF plugin file.
+  FILE_NACL_PLUGIN,            // Full path to the internal NaCl plugin file.
+  DIR_PNACL_BASE,              // Full path to the base dir for PNaCl.
+  DIR_PNACL_COMPONENT,         // Full path to the latest PNaCl version
+                               // (subdir of DIR_PNACL_BASE).
+  FILE_O1D_PLUGIN,             // Full path to the O1D Pepper plugin file.
+  FILE_EFFECTS_PLUGIN,         // Full path to the Effects Pepper plugin file.
+  FILE_GTALK_PLUGIN,           // Full path to the GTalk Pepper plugin file.
+  DIR_COMPONENT_WIDEVINE_CDM,  // Directory that contains component-updated
+                               // Widevine CDM files.
+  FILE_WIDEVINE_CDM_ADAPTER,   // Full path to the Widevine CDM adapter file.
+  FILE_RESOURCES_PACK,         // Full path to the .pak file containing
+                               // binary data (e.g., html files and images
+                               // used by internal pages).
+  DIR_RESOURCES_EXTENSION,     // Full path to extension resources.
 #if defined(OS_CHROMEOS)
-  DIR_CHROMEOS_WALLPAPERS,      // Directory where downloaded chromeos
-                                // wallpapers reside.
+  DIR_CHROMEOS_WALLPAPERS,            // Directory where downloaded chromeos
+                                      // wallpapers reside.
   DIR_CHROMEOS_WALLPAPER_THUMBNAILS,  // Directory where downloaded chromeos
                                       // wallpaper thumbnails reside.
   DIR_CHROMEOS_CUSTOM_WALLPAPERS,     // Directory where custom wallpapers
@@ -112,17 +111,16 @@ enum {
                                    // session starts.
 
 #if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
-  DIR_NATIVE_MESSAGING,         // System directory where native messaging host
-                                // manifest files are stored.
-  DIR_USER_NATIVE_MESSAGING,    // Directory with Native Messaging Hosts
-                                // installed per-user.
+  DIR_NATIVE_MESSAGING,       // System directory where native messaging host
+                              // manifest files are stored.
+  DIR_USER_NATIVE_MESSAGING,  // Directory with Native Messaging Hosts
+                              // installed per-user.
 #endif
 
   // Valid only in development environment; TODO(darin): move these
-  DIR_GEN_TEST_DATA,            // Directory where generated test data resides.
-  DIR_TEST_DATA,                // Directory where unit test data resides.
-  DIR_TEST_TOOLS,               // Directory where unit test tools reside.
-
+  DIR_GEN_TEST_DATA,  // Directory where generated test data resides.
+  DIR_TEST_DATA,      // Directory where unit test data resides.
+  DIR_TEST_TOOLS,     // Directory where unit test tools reside.
   PATH_END
 };