linux: Default to custom frame for EWMH-supporting WMs.

chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc

 // Copyright (c) 2013 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/metrics/chrome_browser_main_extra_parts_metrics.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 35 matching lines @@
   UMA_LINUX_GLIBC_2_11,
   UMA_LINUX_GLIBC_2_19 = UMA_LINUX_GLIBC_2_11 + 8,
   // NOTE: Add new version above this line and update the enum list in
   // tools/metrics/histograms/histograms.xml accordingly.
   UMA_LINUX_GLIBC_VERSION_COUNT
 };
 
 enum UMALinuxWindowManager {
   UMA_LINUX_WINDOW_MANAGER_OTHER,
   UMA_LINUX_WINDOW_MANAGER_BLACKBOX,
-  UMA_LINUX_WINDOW_MANAGER_CHROME_OS,
+  UMA_LINUX_WINDOW_MANAGER_CHROME_OS,  // Deprecated.
   UMA_LINUX_WINDOW_MANAGER_COMPIZ,
   UMA_LINUX_WINDOW_MANAGER_ENLIGHTENMENT,
   UMA_LINUX_WINDOW_MANAGER_ICE_WM,
   UMA_LINUX_WINDOW_MANAGER_KWIN,
   UMA_LINUX_WINDOW_MANAGER_METACITY,
   UMA_LINUX_WINDOW_MANAGER_MUFFIN,
   UMA_LINUX_WINDOW_MANAGER_MUTTER,
   UMA_LINUX_WINDOW_MANAGER_OPENBOX,
   UMA_LINUX_WINDOW_MANAGER_XFWM4,
-  // NOTE: Add new window managers above this line and update the enum list in
+  UMA_LINUX_WINDOW_MANAGER_AWESOME,
+  UMA_LINUX_WINDOW_MANAGER_I3,
+  UMA_LINUX_WINDOW_MANAGER_ION3,
+  UMA_LINUX_WINDOW_MANAGER_MATCHBOX,
+  UMA_LINUX_WINDOW_MANAGER_NOTION,
+  UMA_LINUX_WINDOW_MANAGER_QTILE,
+  UMA_LINUX_WINDOW_MANAGER_RATPOISON,
+  UMA_LINUX_WINDOW_MANAGER_STUMPWM,
+  // NOTE: Append new window managers to the list above this line (i.e. don't
+  // renumber) and update LinuxWindowManagerName in
   // tools/metrics/histograms/histograms.xml accordingly.
   UMA_LINUX_WINDOW_MANAGER_COUNT
 };
 
 enum UMATouchEventsState {
   UMA_TOUCH_EVENTS_ENABLED,
   UMA_TOUCH_EVENTS_AUTO_ENABLED,
   UMA_TOUCH_EVENTS_AUTO_DISABLED,
   UMA_TOUCH_EVENTS_DISABLED,
   // NOTE: Add states only immediately above this line. Make sure to
@@ skipping 49 matching lines @@
         glibc_version_result =
             static_cast<UMALinuxGlibcVersion>(translated_glibc_minor_version);
       }
     }
   }
   UMA_HISTOGRAM_ENUMERATION("Linux.GlibcVersion", glibc_version_result,
                             UMA_LINUX_GLIBC_VERSION_COUNT);
 #endif
 }
 
-void RecordLinuxWindowManager() {
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  ui::WindowManagerName name = ui::GuessWindowManager();
-  UMALinuxWindowManager uma_name = UMA_LINUX_WINDOW_MANAGER_OTHER;
-  switch (name) {
-    case ui::WM_UNKNOWN:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_OTHER;
-      break;
-    case ui::WM_BLACKBOX:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_BLACKBOX;
-      break;
-    case ui::WM_CHROME_OS:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_CHROME_OS;
-      break;
-    case ui::WM_COMPIZ:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_COMPIZ;
-      break;
-    case ui::WM_ENLIGHTENMENT:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_ENLIGHTENMENT;
-      break;
-    case ui::WM_ICE_WM:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_ICE_WM;
-      break;
-    case ui::WM_KWIN:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_KWIN;
-      break;
-    case ui::WM_METACITY:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_METACITY;
-      break;
-    case ui::WM_MUFFIN:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_MUFFIN;
-      break;
-    case ui::WM_MUTTER:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_MUTTER;
-      break;
-    case ui::WM_OPENBOX:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_OPENBOX;
-      break;
-    case ui::WM_XFWM4:
-      uma_name = UMA_LINUX_WINDOW_MANAGER_XFWM4;
-      break;
+UMALinuxWindowManager GetLinuxWindowManager() {
+  switch (ui::GuessWindowManager()) {
+    case ui::WM_UNKNOWN:       return UMA_LINUX_WINDOW_MANAGER_OTHER;

[Matt Giuca, 2014/09/17 01:09:15]

I don't think this conforms to the style guide. Can you put each return
statement on its own line?

[Daniel Erat, 2014/09/18 16:07:58]

this style is fairly common in chromium, afaict:

% git grep 'case.*return' | fgrep -c .cc
806

the "Loops and Conditionals" section of
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Horizontal_Wh...
includes an example of "case 2: break;", implying that putting code to the right
of the case is permitted.

the argument could be made that there should only be a single space to the right
of the colon, but lining up the return statements is more readable and seems to
be done frequently in chromium.

+    case ui::WM_AWESOME:       return UMA_LINUX_WINDOW_MANAGER_AWESOME;
+    case ui::WM_BLACKBOX:      return UMA_LINUX_WINDOW_MANAGER_BLACKBOX;
+    case ui::WM_COMPIZ:        return UMA_LINUX_WINDOW_MANAGER_COMPIZ;
+    case ui::WM_ENLIGHTENMENT: return UMA_LINUX_WINDOW_MANAGER_ENLIGHTENMENT;
+    case ui::WM_I3:            return UMA_LINUX_WINDOW_MANAGER_I3;
+    case ui::WM_ICE_WM:        return UMA_LINUX_WINDOW_MANAGER_ICE_WM;
+    case ui::WM_ION3:          return UMA_LINUX_WINDOW_MANAGER_ION3;
+    case ui::WM_KWIN:          return UMA_LINUX_WINDOW_MANAGER_KWIN;
+    case ui::WM_MATCHBOX:      return UMA_LINUX_WINDOW_MANAGER_MATCHBOX;
+    case ui::WM_METACITY:      return UMA_LINUX_WINDOW_MANAGER_METACITY;
+    case ui::WM_MUFFIN:        return UMA_LINUX_WINDOW_MANAGER_MUFFIN;
+    case ui::WM_MUTTER:        return UMA_LINUX_WINDOW_MANAGER_MUTTER;
+    case ui::WM_NOTION:        return UMA_LINUX_WINDOW_MANAGER_NOTION;
+    case ui::WM_OPENBOX:       return UMA_LINUX_WINDOW_MANAGER_OPENBOX;
+    case ui::WM_QTILE:         return UMA_LINUX_WINDOW_MANAGER_QTILE;
+    case ui::WM_RATPOISON:     return UMA_LINUX_WINDOW_MANAGER_RATPOISON;
+    case ui::WM_STUMPWM:       return UMA_LINUX_WINDOW_MANAGER_STUMPWM;
+    case ui::WM_XFWM4:         return UMA_LINUX_WINDOW_MANAGER_XFWM4;
   }
-  UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager", uma_name,
-                            UMA_LINUX_WINDOW_MANAGER_COUNT);
+  return UMA_LINUX_WINDOW_MANAGER_OTHER;
+}
 #endif
-}
 
 void RecordTouchEventState() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   const std::string touch_enabled_switch =
       command_line.HasSwitch(switches::kTouchEvents) ?
       command_line.GetSwitchValueASCII(switches::kTouchEvents) :
       switches::kTouchEventsAuto;
 
   UMATouchEventsState state;
   if (touch_enabled_switch.empty() ||
@@ skipping 26 matching lines @@
 }
 
 void ChromeBrowserMainExtraPartsMetrics::PreBrowserStart() {
   about_flags::PrefServiceFlagsStorage flags_storage_(
       g_browser_process->local_state());
   about_flags::RecordUMAStatistics(&flags_storage_);
 }
 
 void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() {
   RecordLinuxGlibcVersion();
-  RecordLinuxWindowManager();
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+  UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager",
+                            GetLinuxWindowManager(),
+                            UMA_LINUX_WINDOW_MANAGER_COUNT);
+#endif
   RecordTouchEventState();
 
   const int kStartupMetricsGatheringDelaySeconds = 45;
   content::BrowserThread::GetBlockingPool()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&RecordStartupMetricsOnBlockingPool),
       base::TimeDelta::FromSeconds(kStartupMetricsGatheringDelaySeconds));
 }
 
 namespace chrome {
 
 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts) {
   main_parts->AddParts(new ChromeBrowserMainExtraPartsMetrics());
 }
 
 }  // namespace chrome