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 949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
960 // line regardless of the origin (command line or about:flags). | 960 // line regardless of the origin (command line or about:flags). |
961 if (parsed_command_line().HasSwitch(switches::kTraceExportEventsToETW)) | 961 if (parsed_command_line().HasSwitch(switches::kTraceExportEventsToETW)) |
962 base::trace_event::TraceEventETWExport::EnableETWExport(); | 962 base::trace_event::TraceEventETWExport::EnableETWExport(); |
963 #endif // OS_WIN | 963 #endif // OS_WIN |
964 | 964 |
965 local_state_->UpdateCommandLinePrefStore( | 965 local_state_->UpdateCommandLinePrefStore( |
966 new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())); | 966 new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())); |
967 | 967 |
968 // Reset the command line in the crash report details, since we may have | 968 // Reset the command line in the crash report details, since we may have |
969 // just changed it to include experiments. | 969 // just changed it to include experiments. |
970 crash_keys::SetSwitchesFromCommandLine( | 970 crash_keys::SetCrashKeysFromCommandLine( |
971 base::CommandLine::ForCurrentProcess()); | 971 *base::CommandLine::ForCurrentProcess()); |
972 | 972 |
973 // Mac starts it earlier in |PreMainMessageLoopStart()| (because it is | 973 // Mac starts it earlier in |PreMainMessageLoopStart()| (because it is |
974 // needed when loading the MainMenu.nib and the language doesn't depend on | 974 // needed when loading the MainMenu.nib and the language doesn't depend on |
975 // anything since it comes from Cocoa. | 975 // anything since it comes from Cocoa. |
976 #if defined(OS_MACOSX) | 976 #if defined(OS_MACOSX) |
977 std::string locale = | 977 std::string locale = |
978 parameters().ui_task ? "en-US" : l10n_util::GetLocaleOverride(); | 978 parameters().ui_task ? "en-US" : l10n_util::GetLocaleOverride(); |
979 browser_process_->SetApplicationLocale(locale); | 979 browser_process_->SetApplicationLocale(locale); |
980 #else | 980 #else |
981 const std::string locale = | 981 const std::string locale = |
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1882 chromeos::CrosSettings::Shutdown(); | 1882 chromeos::CrosSettings::Shutdown(); |
1883 #endif // defined(OS_CHROMEOS) | 1883 #endif // defined(OS_CHROMEOS) |
1884 #endif // defined(OS_ANDROID) | 1884 #endif // defined(OS_ANDROID) |
1885 } | 1885 } |
1886 | 1886 |
1887 // Public members: | 1887 // Public members: |
1888 | 1888 |
1889 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1889 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1890 chrome_extra_parts_.push_back(parts); | 1890 chrome_extra_parts_.push_back(parts); |
1891 } | 1891 } |
OLD | NEW |