Linux: Support the --class argument (Reland)

chrome/browser/shell_integration_linux.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_LINUX_H_
 #define CHROME_BROWSER_SHELL_INTEGRATION_LINUX_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 12 matching lines @@
 // http://standards.freedesktop.org/basedir-spec/latest/
 // Called on the FILE thread.
 base::FilePath GetDataWriteLocation(base::Environment* env);
 
 // Get the list of paths to search for application data files, in order of
 // preference, as specified in the XDG Base Directory Specification:
 // http://standards.freedesktop.org/basedir-spec/latest/
 // 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);
 
 // Returns name of the browser icon (without a path or file extension).
 std::string GetIconName();
 
 // Returns the set of locations in which shortcuts are installed for the
 // extension with |extension_id| in |profile_path|.
 // This searches the file system for .desktop files in appropriate locations. A
 // shortcut with NoDisplay=true causes hidden to become true, instead of
@@ skipping 84 matching lines @@
 void DeleteDesktopShortcuts(const base::FilePath& profile_path,
                             const std::string& extension_id);
 
 // Delete any desktop shortcuts on desktop or in the application menu that have
 // for the profile in |profile_path|.
 void DeleteAllDesktopShortcuts(const base::FilePath& profile_path);
 
 }  // namespace shell_integration_linux
 
 #endif  // CHROME_BROWSER_SHELL_INTEGRATION_LINUX_H_