| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 759 parsed_command_line_(parameters.command_line), | 759 parsed_command_line_(parameters.command_line), |
| 760 result_code_(content::RESULT_CODE_NORMAL_EXIT), | 760 result_code_(content::RESULT_CODE_NORMAL_EXIT), |
| 761 startup_watcher_(new StartupTimeBomb()), | 761 startup_watcher_(new StartupTimeBomb()), |
| 762 shutdown_watcher_(new ShutdownWatcherHelper()), | 762 shutdown_watcher_(new ShutdownWatcherHelper()), |
| 763 browser_field_trials_(parameters.command_line), | 763 browser_field_trials_(parameters.command_line), |
| 764 sampling_profiler_( | 764 sampling_profiler_( |
| 765 base::PlatformThread::CurrentId(), | 765 base::PlatformThread::CurrentId(), |
| 766 sampling_profiler_config_.GetSamplingParams(), | 766 sampling_profiler_config_.GetSamplingParams(), |
| 767 metrics::CallStackProfileMetricsProvider::GetProfilerCallback( | 767 metrics::CallStackProfileMetricsProvider::GetProfilerCallback( |
| 768 metrics::CallStackProfileParams( | 768 metrics::CallStackProfileParams( |
| 769 metrics::CallStackProfileParams::BROWSER_PROCESS, |
| 770 metrics::CallStackProfileParams::UI_THREAD, |
| 769 metrics::CallStackProfileParams::PROCESS_STARTUP, | 771 metrics::CallStackProfileParams::PROCESS_STARTUP, |
| 770 metrics::CallStackProfileParams::MAY_SHUFFLE))), | 772 metrics::CallStackProfileParams::MAY_SHUFFLE))), |
| 771 profile_(NULL), | 773 profile_(NULL), |
| 772 run_message_loop_(true), | 774 run_message_loop_(true), |
| 773 local_state_(NULL) { | 775 local_state_(NULL) { |
| 774 if (sampling_profiler_config_.IsProfilerEnabled()) | 776 if (sampling_profiler_config_.IsProfilerEnabled()) |
| 775 sampling_profiler_.Start(); | 777 sampling_profiler_.Start(); |
| 776 | 778 |
| 777 // If we're running tests (ui_task is non-null). | 779 // If we're running tests (ui_task is non-null). |
| 778 if (parameters.ui_task) | 780 if (parameters.ui_task) |
| (...skipping 1437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2216 chromeos::CrosSettings::Shutdown(); | 2218 chromeos::CrosSettings::Shutdown(); |
| 2217 #endif // defined(OS_CHROMEOS) | 2219 #endif // defined(OS_CHROMEOS) |
| 2218 #endif // defined(OS_ANDROID) | 2220 #endif // defined(OS_ANDROID) |
| 2219 } | 2221 } |
| 2220 | 2222 |
| 2221 // Public members: | 2223 // Public members: |
| 2222 | 2224 |
| 2223 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2225 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2224 chrome_extra_parts_.push_back(parts); | 2226 chrome_extra_parts_.push_back(parts); |
| 2225 } | 2227 } |
| OLD | NEW |