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 917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
928 // line regardless of the origin (command line or about:flags). | 928 // line regardless of the origin (command line or about:flags). |
929 if (parsed_command_line().HasSwitch(switches::kTraceExportEventsToETW)) | 929 if (parsed_command_line().HasSwitch(switches::kTraceExportEventsToETW)) |
930 base::trace_event::TraceEventETWExport::EnableETWExport(); | 930 base::trace_event::TraceEventETWExport::EnableETWExport(); |
931 #endif // OS_WIN | 931 #endif // OS_WIN |
932 | 932 |
933 local_state_->UpdateCommandLinePrefStore( | 933 local_state_->UpdateCommandLinePrefStore( |
934 new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())); | 934 new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())); |
935 | 935 |
936 // Reset the command line in the crash report details, since we may have | 936 // Reset the command line in the crash report details, since we may have |
937 // just changed it to include experiments. | 937 // just changed it to include experiments. |
938 crash_keys::SetSwitchesFromCommandLine( | 938 crash_keys::SetCrashKeysFromCommandLine( |
939 base::CommandLine::ForCurrentProcess()); | 939 *base::CommandLine::ForCurrentProcess()); |
940 | 940 |
941 // Mac starts it earlier in |PreMainMessageLoopStart()| (because it is | 941 // Mac starts it earlier in |PreMainMessageLoopStart()| (because it is |
942 // needed when loading the MainMenu.nib and the language doesn't depend on | 942 // needed when loading the MainMenu.nib and the language doesn't depend on |
943 // anything since it comes from Cocoa. | 943 // anything since it comes from Cocoa. |
944 #if defined(OS_MACOSX) | 944 #if defined(OS_MACOSX) |
945 std::string locale = | 945 std::string locale = |
946 parameters().ui_task ? "en-US" : l10n_util::GetLocaleOverride(); | 946 parameters().ui_task ? "en-US" : l10n_util::GetLocaleOverride(); |
947 browser_process_->SetApplicationLocale(locale); | 947 browser_process_->SetApplicationLocale(locale); |
948 #else | 948 #else |
949 const std::string locale = | 949 const std::string locale = |
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1850 chromeos::CrosSettings::Shutdown(); | 1850 chromeos::CrosSettings::Shutdown(); |
1851 #endif // defined(OS_CHROMEOS) | 1851 #endif // defined(OS_CHROMEOS) |
1852 #endif // defined(OS_ANDROID) | 1852 #endif // defined(OS_ANDROID) |
1853 } | 1853 } |
1854 | 1854 |
1855 // Public members: | 1855 // Public members: |
1856 | 1856 |
1857 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1857 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1858 chrome_extra_parts_.push_back(parts); | 1858 chrome_extra_parts_.push_back(parts); |
1859 } | 1859 } |
OLD | NEW |