| 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 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1038 #endif | 1038 #endif |
| 1039 | 1039 |
| 1040 #if defined(OS_WIN) | 1040 #if defined(OS_WIN) |
| 1041 // This is needed to enable ETW exporting when requested in about:flags. | 1041 // This is needed to enable ETW exporting when requested in about:flags. |
| 1042 // Normally, we enable it in ContentMainRunnerImpl::Initialize when the flag | 1042 // Normally, we enable it in ContentMainRunnerImpl::Initialize when the flag |
| 1043 // is present on the command line but flags in about:flags are converted only | 1043 // is present on the command line but flags in about:flags are converted only |
| 1044 // after this function runs. Note that this starts exporting later which | 1044 // after this function runs. Note that this starts exporting later which |
| 1045 // affects tracing the browser startup. Also, this is only relevant for the | 1045 // affects tracing the browser startup. Also, this is only relevant for the |
| 1046 // browser process, as other processes will get all the flags on their command | 1046 // browser process, as other processes will get all the flags on their command |
| 1047 // line regardless of the origin (command line or about:flags). | 1047 // line regardless of the origin (command line or about:flags). |
| 1048 if (parsed_command_line().HasSwitch(switches::kTraceExportEventsToETW)) | 1048 //if (parsed_command_line().HasSwitch(switches::kTraceExportEventsToETW)) |
| 1049 base::trace_event::TraceEventETWExport::EnableETWExport(); | 1049 //base::trace_event::TraceEventETWExport::EnableETWExport(); |
| 1050 #endif // OS_WIN | 1050 #endif // OS_WIN |
| 1051 | 1051 |
| 1052 local_state_->UpdateCommandLinePrefStore( | 1052 local_state_->UpdateCommandLinePrefStore( |
| 1053 new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())); | 1053 new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())); |
| 1054 | 1054 |
| 1055 // Reset the command line in the crash report details, since we may have | 1055 // Reset the command line in the crash report details, since we may have |
| 1056 // just changed it to include experiments. | 1056 // just changed it to include experiments. |
| 1057 crash_keys::SetCrashKeysFromCommandLine( | 1057 crash_keys::SetCrashKeysFromCommandLine( |
| 1058 *base::CommandLine::ForCurrentProcess()); | 1058 *base::CommandLine::ForCurrentProcess()); |
| 1059 | 1059 |
| (...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2038 chromeos::CrosSettings::Shutdown(); | 2038 chromeos::CrosSettings::Shutdown(); |
| 2039 #endif // defined(OS_CHROMEOS) | 2039 #endif // defined(OS_CHROMEOS) |
| 2040 #endif // defined(OS_ANDROID) | 2040 #endif // defined(OS_ANDROID) |
| 2041 } | 2041 } |
| 2042 | 2042 |
| 2043 // Public members: | 2043 // Public members: |
| 2044 | 2044 |
| 2045 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2045 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2046 chrome_extra_parts_.push_back(parts); | 2046 chrome_extra_parts_.push_back(parts); |
| 2047 } | 2047 } |
| OLD | NEW |