OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 if (only_do_metrics_recording) { | 629 if (only_do_metrics_recording) { |
630 // If we're testing then we don't care what the user preference is, we turn | 630 // If we're testing then we don't care what the user preference is, we turn |
631 // on recording, but not reporting, otherwise tests fail. | 631 // on recording, but not reporting, otherwise tests fail. |
632 metrics->StartRecordingForTests(); | 632 metrics->StartRecordingForTests(); |
633 return; | 633 return; |
634 } | 634 } |
635 | 635 |
636 metrics->CheckForClonedInstall( | 636 metrics->CheckForClonedInstall( |
637 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); | 637 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); |
638 const bool metrics_enabled = metrics->StartIfMetricsReportingEnabled(); | 638 const bool metrics_enabled = metrics->StartIfMetricsReportingEnabled(); |
639 if (metrics_enabled) { | 639 // TODO(asvitkine): Since this function is not run on Android, RAPPOR is |
640 // TODO(asvitkine): Since this function is not run on Android, RAPPOR is | 640 // currently disabled there. http://crbug.com/370041 |
641 // currently disabled there. http://crbug.com/370041 | 641 browser_process_->rappor_service()->Start( |
642 browser_process_->rappor_service()->Start( | 642 browser_process_->local_state(), |
643 browser_process_->local_state(), | 643 browser_process_->system_request_context(), |
644 browser_process_->system_request_context()); | 644 metrics_enabled); |
645 } | |
646 } | 645 } |
647 | 646 |
648 void ChromeBrowserMainParts::RecordBrowserStartupTime() { | 647 void ChromeBrowserMainParts::RecordBrowserStartupTime() { |
649 // Don't record any metrics if UI was displayed before this point e.g. | 648 // Don't record any metrics if UI was displayed before this point e.g. |
650 // warning dialogs. | 649 // warning dialogs. |
651 if (startup_metric_utils::WasNonBrowserUIDisplayed()) | 650 if (startup_metric_utils::WasNonBrowserUIDisplayed()) |
652 return; | 651 return; |
653 | 652 |
654 #if defined(OS_ANDROID) | 653 #if defined(OS_ANDROID) |
655 // On Android the first run is handled in Java code, and the C++ side of | 654 // On Android the first run is handled in Java code, and the C++ side of |
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1655 chromeos::CrosSettings::Shutdown(); | 1654 chromeos::CrosSettings::Shutdown(); |
1656 #endif | 1655 #endif |
1657 #endif | 1656 #endif |
1658 } | 1657 } |
1659 | 1658 |
1660 // Public members: | 1659 // Public members: |
1661 | 1660 |
1662 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1661 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1663 chrome_extra_parts_.push_back(parts); | 1662 chrome_extra_parts_.push_back(parts); |
1664 } | 1663 } |
OLD | NEW |