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 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 const bool only_do_metrics_recording = | 622 const bool only_do_metrics_recording = |
623 parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) || | 623 parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) || |
624 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking); | 624 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking); |
625 if (only_do_metrics_recording) { | 625 if (only_do_metrics_recording) { |
626 // If we're testing then we don't care what the user preference is, we turn | 626 // If we're testing then we don't care what the user preference is, we turn |
627 // on recording, but not reporting, otherwise tests fail. | 627 // on recording, but not reporting, otherwise tests fail. |
628 metrics->StartRecordingForTests(); | 628 metrics->StartRecordingForTests(); |
629 return; | 629 return; |
630 } | 630 } |
631 | 631 |
632 metrics->CheckForClonedInstall(); | 632 metrics->CheckForClonedInstall( |
| 633 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); |
633 const bool metrics_enabled = metrics->StartIfMetricsReportingEnabled(); | 634 const bool metrics_enabled = metrics->StartIfMetricsReportingEnabled(); |
634 if (metrics_enabled) { | 635 if (metrics_enabled) { |
635 // TODO(asvitkine): Since this function is not run on Android, RAPPOR is | 636 // TODO(asvitkine): Since this function is not run on Android, RAPPOR is |
636 // currently disabled there. http://crbug.com/370041 | 637 // currently disabled there. http://crbug.com/370041 |
637 browser_process_->rappor_service()->Start( | 638 browser_process_->rappor_service()->Start( |
638 browser_process_->local_state(), | 639 browser_process_->local_state(), |
639 browser_process_->system_request_context()); | 640 browser_process_->system_request_context()); |
640 } | 641 } |
641 } | 642 } |
642 | 643 |
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1652 chromeos::CrosSettings::Shutdown(); | 1653 chromeos::CrosSettings::Shutdown(); |
1653 #endif | 1654 #endif |
1654 #endif | 1655 #endif |
1655 } | 1656 } |
1656 | 1657 |
1657 // Public members: | 1658 // Public members: |
1658 | 1659 |
1659 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1660 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1660 chrome_extra_parts_.push_back(parts); | 1661 chrome_extra_parts_.push_back(parts); |
1661 } | 1662 } |
OLD | NEW |