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

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

Issue 2918663004: Condition ::RecordLinuxDistro against OS_LINUX, not USE_X11 (Closed)
Patch Set: Created 3 years, 6 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 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 "Enabled" 457 "Enabled"
458 #else 458 #else
459 "Disabled" 459 "Disabled"
460 #endif 460 #endif
461 ); 461 );
462 #endif 462 #endif
463 } 463 }
464 464
465 void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() { 465 void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() {
466 RecordLinuxGlibcVersion(); 466 RecordLinuxGlibcVersion();
467 #if defined(USE_X11) && !defined(OS_CHROMEOS) 467 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
Lei Zhang 2017/06/01 04:27:09 This matches the #if that surrounds GetLinuxWindow
468 UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager", 468 UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager",
469 GetLinuxWindowManager(), 469 GetLinuxWindowManager(),
470 UMA_LINUX_WINDOW_MANAGER_COUNT); 470 UMA_LINUX_WINDOW_MANAGER_COUNT);
471 base::PostTaskWithTraits(FROM_HERE, 471 base::PostTaskWithTraits(FROM_HERE,
472 {base::MayBlock(), base::TaskPriority::BACKGROUND}, 472 {base::MayBlock(), base::TaskPriority::BACKGROUND},
473 base::BindOnce(&RecordLinuxDistro)); 473 base::BindOnce(&RecordLinuxDistro));
474 #endif 474 #endif
475 475
476 #if defined(USE_OZONE) || defined(USE_X11) 476 #if defined(USE_OZONE) || defined(USE_X11)
477 // The touch event state for X11 and Ozone based event sub-systems are based 477 // The touch event state for X11 and Ozone based event sub-systems are based
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 } 536 }
537 } 537 }
538 538
539 namespace chrome { 539 namespace chrome {
540 540
541 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts) { 541 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts) {
542 main_parts->AddParts(new ChromeBrowserMainExtraPartsMetrics()); 542 main_parts->AddParts(new ChromeBrowserMainExtraPartsMetrics());
543 } 543 }
544 544
545 } // namespace chrome 545 } // 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