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 <set> | 10 #include <set> |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 browser_field_trials_(parameters.command_line), | 631 browser_field_trials_(parameters.command_line), |
632 sampling_profiler_( | 632 sampling_profiler_( |
633 base::PlatformThread::CurrentId(), | 633 base::PlatformThread::CurrentId(), |
634 sampling_profiler_config_.GetSamplingParams(), | 634 sampling_profiler_config_.GetSamplingParams(), |
635 metrics::CallStackProfileMetricsProvider::GetProfilerCallback( | 635 metrics::CallStackProfileMetricsProvider::GetProfilerCallback( |
636 metrics::CallStackProfileMetricsProvider::Params( | 636 metrics::CallStackProfileMetricsProvider::Params( |
637 metrics::CallStackProfileMetricsProvider::PROCESS_STARTUP, | 637 metrics::CallStackProfileMetricsProvider::PROCESS_STARTUP, |
638 false))), | 638 false))), |
639 profile_(NULL), | 639 profile_(NULL), |
640 run_message_loop_(true), | 640 run_message_loop_(true), |
641 notify_result_(ProcessSingleton::PROCESS_NONE), | 641 local_state_(NULL) { |
642 local_state_(NULL), | |
643 restart_last_session_(false) { | |
644 if (sampling_profiler_config_.IsProfilerEnabled()) | 642 if (sampling_profiler_config_.IsProfilerEnabled()) |
645 sampling_profiler_.Start(); | 643 sampling_profiler_.Start(); |
646 | 644 |
647 // If we're running tests (ui_task is non-null). | 645 // If we're running tests (ui_task is non-null). |
648 if (parameters.ui_task) | 646 if (parameters.ui_task) |
649 browser_defaults::enable_help_app = false; | 647 browser_defaults::enable_help_app = false; |
650 | 648 |
651 // Chrome disallows cookies by default. All code paths that want to use | 649 // Chrome disallows cookies by default. All code paths that want to use |
652 // cookies need to go through one of Chrome's URLRequestContexts which have | 650 // cookies need to go through one of Chrome's URLRequestContexts which have |
653 // a ChromeNetworkDelegate attached that selectively allows cookies again. | 651 // a ChromeNetworkDelegate attached that selectively allows cookies again. |
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1994 chromeos::CrosSettings::Shutdown(); | 1992 chromeos::CrosSettings::Shutdown(); |
1995 #endif // defined(OS_CHROMEOS) | 1993 #endif // defined(OS_CHROMEOS) |
1996 #endif // defined(OS_ANDROID) | 1994 #endif // defined(OS_ANDROID) |
1997 } | 1995 } |
1998 | 1996 |
1999 // Public members: | 1997 // Public members: |
2000 | 1998 |
2001 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1999 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2002 chrome_extra_parts_.push_back(parts); | 2000 chrome_extra_parts_.push_back(parts); |
2003 } | 2001 } |
OLD | NEW |