Linux: Support the --class argument (Reland)

chrome/browser/shell_integration_linux.h

Index: chrome/browser/shell_integration_linux.h
diff --git a/chrome/browser/shell_integration_linux.h b/chrome/browser/shell_integration_linux.h
index f6bd1d828e4b74516fbc5c361b5953f4900b42d0..251da2877a1e9d17619ffd6a25752a7cbdac574b 100644
--- a/chrome/browser/shell_integration_linux.h
+++ b/chrome/browser/shell_integration_linux.h
@@ -30,11 +30,16 @@ base::FilePath GetDataWriteLocation(base::Environment* env);
 // Called on the FILE thread.
 std::vector<base::FilePath> GetDataSearchLocations(base::Environment* env);
 
-// Gets the name for use as the res_class (and possibly res_name) of the
-// window's WM_CLASS property. This is the program name from argv[0], with the
-// first letter capitalized. Equivalent to GDK's gdk_get_program_class().
+// Gets the name for use as the res_name of the window's WM_CLASS property.
+std::string GetProgramClassName(const base::CommandLine& command_line,
+                                const std::string& desktop_file_name);
 std::string GetProgramClassName();
 
+// Gets the name for use as the res_class of the window's WM_CLASS property.
+std::string GetProgramClassClass(const base::CommandLine& command_line,
+                                 const std::string& desktop_file_name);
+std::string GetProgramClassClass();

[Tom (Use chromium acct), 2016/07/27 19:33:09]

It feels messy having this be overloaded, but I need the arguments for the unit
test.

[sky, 2016/07/27 19:58:04]

Can't the test replace the command line?

[Tom (Use chromium acct), 2016/07/27 22:04:34]

Yes, but what about the desktop file name?  The values are hard-coded here
https://cs.chromium.org/chromium/src/chrome/browser/shell_integration_linux.c...

[sky, 2016/07/27 22:40:21]

Agreed, for that you need to pass in the desktop_file_name. 

+
 // Returns filename of the desktop shortcut used to launch the browser.
 std::string GetDesktopName(base::Environment* env);