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..c0f99c18eeed5e19226d4bf35429c330c72316f2 100644
--- a/chrome/browser/shell_integration_linux.h
+++ b/chrome/browser/shell_integration_linux.h
@@ -30,11 +30,12 @@ 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();
 
+// Gets the name for use as the res_class of the window's WM_CLASS property.
+std::string GetProgramClassClass();
+
 // Returns filename of the desktop shortcut used to launch the browser.
 std::string GetDesktopName(base::Environment* env);
 
@@ -136,6 +137,16 @@ void DeleteDesktopShortcuts(const base::FilePath& profile_path,
 // for the profile in |profile_path|.
 void DeleteAllDesktopShortcuts(const base::FilePath& profile_path);
 
+namespace internal {
+
+std::string GetProgramClassName(const base::CommandLine& command_line,

[Lei Zhang, 2016/07/28 21:28:46]

Mention these are exposed only for testing?

[Tom (Use chromium acct), 2016/07/28 23:02:13]

Done.

+                                const std::string& desktop_file_name);
+
+std::string GetProgramClassClass(const base::CommandLine& command_line,
+                                 const std::string& desktop_file_name);
+
+}  // namespace internal
+
 }  // namespace shell_integration_linux
 
 #endif  // CHROME_BROWSER_SHELL_INTEGRATION_LINUX_H_