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 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
841 TRACE_EVENT0("startup", | 841 TRACE_EVENT0("startup", |
842 "ChromeBrowserMainParts::PreCreateThreadsImpl:InitProfiling"); | 842 "ChromeBrowserMainParts::PreCreateThreadsImpl:InitProfiling"); |
843 // User wants to override default tracking status. | 843 // User wants to override default tracking status. |
844 std::string flag = | 844 std::string flag = |
845 parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling); | 845 parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling); |
846 // Default to basic profiling (no parent child support). | 846 // Default to basic profiling (no parent child support). |
847 tracked_objects::ThreadData::Status status = | 847 tracked_objects::ThreadData::Status status = |
848 tracked_objects::ThreadData::PROFILING_ACTIVE; | 848 tracked_objects::ThreadData::PROFILING_ACTIVE; |
849 if (flag.compare("0") != 0) | 849 if (flag.compare("0") != 0) |
850 status = tracked_objects::ThreadData::DEACTIVATED; | 850 status = tracked_objects::ThreadData::DEACTIVATED; |
851 else if (flag.compare("child") != 0) | |
852 status = tracked_objects::ThreadData::PROFILING_CHILDREN_ACTIVE; | |
853 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(status); | 851 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(status); |
854 } | 852 } |
855 | 853 |
856 local_state_ = InitializeLocalState( | 854 local_state_ = InitializeLocalState( |
857 local_state_task_runner.get(), parsed_command_line()); | 855 local_state_task_runner.get(), parsed_command_line()); |
858 | 856 |
859 #if !defined(OS_ANDROID) | 857 #if !defined(OS_ANDROID) |
860 // These members must be initialized before returning from this function. | 858 // These members must be initialized before returning from this function. |
861 master_prefs_.reset(new first_run::MasterPrefs); | 859 master_prefs_.reset(new first_run::MasterPrefs); |
862 // Android doesn't use StartupBrowserCreator. | 860 // Android doesn't use StartupBrowserCreator. |
(...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1766 chromeos::CrosSettings::Shutdown(); | 1764 chromeos::CrosSettings::Shutdown(); |
1767 #endif // defined(OS_CHROMEOS) | 1765 #endif // defined(OS_CHROMEOS) |
1768 #endif // defined(OS_ANDROID) | 1766 #endif // defined(OS_ANDROID) |
1769 } | 1767 } |
1770 | 1768 |
1771 // Public members: | 1769 // Public members: |
1772 | 1770 |
1773 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1771 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1774 chrome_extra_parts_.push_back(parts); | 1772 chrome_extra_parts_.push_back(parts); |
1775 } | 1773 } |
OLD | NEW |