Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc

Issue 500713002: Fix linking issue for Chromium Browser with Ozone build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 5 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/shell_integration.h" 23 #include "chrome/browser/shell_integration.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "ui/base/touch/touch_device.h" 25 #include "ui/base/touch/touch_device.h"
26 #include "ui/base/ui_base_switches.h" 26 #include "ui/base/ui_base_switches.h"
27 #include "ui/events/event_switches.h" 27 #include "ui/events/event_switches.h"
28 28
29 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 29 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
30 #include <gnu/libc-version.h> 30 #include <gnu/libc-version.h>
31 31
32 #include "base/version.h" 32 #include "base/version.h"
33 #include "ui/base/x/x11_util.h" 33 #include "ui/base/x/x11_util.h"
Alexei Svitkine (slow) 2014/08/23 15:18:32 Nit: Should this check the X11 ifdef too?
kondapallykalyan 2014/08/23 18:20:57 Done.
34 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 34 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
35 35
36 #if defined(OS_WIN) 36 #if defined(OS_WIN)
37 #include "chrome/installer/util/google_update_settings.h" 37 #include "chrome/installer/util/google_update_settings.h"
38 #endif // defined(OS_WIN) 38 #endif // defined(OS_WIN)
39 39
40 namespace { 40 namespace {
41 41
42 enum UMALinuxGlibcVersion { 42 enum UMALinuxGlibcVersion {
43 UMA_LINUX_GLIBC_NOT_PARSEABLE, 43 UMA_LINUX_GLIBC_NOT_PARSEABLE,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 static_cast<UMALinuxGlibcVersion>(translated_glibc_minor_version); 126 static_cast<UMALinuxGlibcVersion>(translated_glibc_minor_version);
127 } 127 }
128 } 128 }
129 } 129 }
130 UMA_HISTOGRAM_ENUMERATION("Linux.GlibcVersion", glibc_version_result, 130 UMA_HISTOGRAM_ENUMERATION("Linux.GlibcVersion", glibc_version_result,
131 UMA_LINUX_GLIBC_VERSION_COUNT); 131 UMA_LINUX_GLIBC_VERSION_COUNT);
132 #endif 132 #endif
133 } 133 }
134 134
135 void RecordLinuxWindowManager() { 135 void RecordLinuxWindowManager() {
136 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 136 #if defined(USE_X11) && !defined(OS_CHROMEOS)
137 ui::WindowManagerName name = ui::GuessWindowManager(); 137 ui::WindowManagerName name = ui::GuessWindowManager();
138 UMALinuxWindowManager uma_name = UMA_LINUX_WINDOW_MANAGER_OTHER; 138 UMALinuxWindowManager uma_name = UMA_LINUX_WINDOW_MANAGER_OTHER;
139 switch (name) { 139 switch (name) {
140 case ui::WM_UNKNOWN: 140 case ui::WM_UNKNOWN:
141 uma_name = UMA_LINUX_WINDOW_MANAGER_OTHER; 141 uma_name = UMA_LINUX_WINDOW_MANAGER_OTHER;
142 break; 142 break;
143 case ui::WM_BLACKBOX: 143 case ui::WM_BLACKBOX:
144 uma_name = UMA_LINUX_WINDOW_MANAGER_BLACKBOX; 144 uma_name = UMA_LINUX_WINDOW_MANAGER_BLACKBOX;
145 break; 145 break;
146 case ui::WM_CHROME_OS: 146 case ui::WM_CHROME_OS:
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 #endif 240 #endif
241 } 241 }
242 242
243 namespace chrome { 243 namespace chrome {
244 244
245 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts) { 245 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts) {
246 main_parts->AddParts(new ChromeBrowserMainExtraPartsMetrics()); 246 main_parts->AddParts(new ChromeBrowserMainExtraPartsMetrics());
247 } 247 }
248 248
249 } // namespace chrome 249 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698