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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 // affected by experiment flags (--touch-optimized-ui in particular). Not | 891 // affected by experiment flags (--touch-optimized-ui in particular). Not |
892 // needed on Android as there aren't experimental flags. | 892 // needed on Android as there aren't experimental flags. |
893 // On ChromeOS system level flags are applied from the device settings from | 893 // On ChromeOS system level flags are applied from the device settings from |
894 // the session manager. | 894 // the session manager. |
895 { | 895 { |
896 TRACE_EVENT0("startup", | 896 TRACE_EVENT0("startup", |
897 "ChromeBrowserMainParts::PreCreateThreadsImpl:ConvertFlags"); | 897 "ChromeBrowserMainParts::PreCreateThreadsImpl:ConvertFlags"); |
898 about_flags::PrefServiceFlagsStorage flags_storage_( | 898 about_flags::PrefServiceFlagsStorage flags_storage_( |
899 g_browser_process->local_state()); | 899 g_browser_process->local_state()); |
900 about_flags::ConvertFlagsToSwitches(&flags_storage_, | 900 about_flags::ConvertFlagsToSwitches(&flags_storage_, |
901 CommandLine::ForCurrentProcess()); | 901 CommandLine::ForCurrentProcess(), |
| 902 about_flags::kAddSentinels); |
902 } | 903 } |
903 #endif | 904 #endif |
904 | 905 |
905 local_state_->UpdateCommandLinePrefStore( | 906 local_state_->UpdateCommandLinePrefStore( |
906 new CommandLinePrefStore(CommandLine::ForCurrentProcess())); | 907 new CommandLinePrefStore(CommandLine::ForCurrentProcess())); |
907 | 908 |
908 // Reset the command line in the crash report details, since we may have | 909 // Reset the command line in the crash report details, since we may have |
909 // just changed it to include experiments. | 910 // just changed it to include experiments. |
910 child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); | 911 child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); |
911 | 912 |
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1695 chromeos::CrosSettings::Shutdown(); | 1696 chromeos::CrosSettings::Shutdown(); |
1696 #endif | 1697 #endif |
1697 #endif | 1698 #endif |
1698 } | 1699 } |
1699 | 1700 |
1700 // Public members: | 1701 // Public members: |
1701 | 1702 |
1702 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1703 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1703 chrome_extra_parts_.push_back(parts); | 1704 chrome_extra_parts_.push_back(parts); |
1704 } | 1705 } |
OLD | NEW |