Linux: Support the --class argument (Reland)

chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h"
 
 #include <utility>
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "base/macros.h"
@@ skipping 45 matching lines @@
 void ChromeNativeAppWindowViewsAura::OnBeforeWidgetInit(
     const AppWindow::CreateParams& create_params,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
       app_window()->extension_id());
   // Set up a custom WM_CLASS for app windows. This allows task switchers in
   // X11 environments to distinguish them from main browser windows.
   init_params->wm_class_name = web_app::GetWMClassFromAppName(app_name);
-  init_params->wm_class_class = shell_integration_linux::GetProgramClassName();
+  init_params->wm_class_class = shell_integration_linux::GetProgramClassClass();
   const char kX11WindowRoleApp[] = "app";
   init_params->wm_role_name = std::string(kX11WindowRoleApp);
 #endif
 
   ChromeNativeAppWindowViews::OnBeforeWidgetInit(create_params, init_params,
                                                  widget);
 }
 
 views::NonClientFrameView*
 ChromeNativeAppWindowViewsAura::CreateNonStandardAppFrame() {
@@ skipping 48 matching lines @@
   ChromeNativeAppWindowViews::UpdateShape(std::move(region));
 
   aura::Window* native_window = widget()->GetNativeWindow();
   if (shape() && !had_shape) {
     native_window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(
         new ShapedAppWindowTargeter(native_window, this)));
   } else if (!shape() && had_shape) {
     native_window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>());
   }
 }