OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1152 } else { | 1152 } else { |
1153 browser_process_.reset(new BrowserProcessImpl(parsed_command_line())); | 1153 browser_process_.reset(new BrowserProcessImpl(parsed_command_line())); |
1154 } | 1154 } |
1155 | 1155 |
1156 if (parsed_command_line().HasSwitch(switches::kEnableProfiling)) { | 1156 if (parsed_command_line().HasSwitch(switches::kEnableProfiling)) { |
1157 // User wants to override default tracking status. | 1157 // User wants to override default tracking status. |
1158 std::string flag = | 1158 std::string flag = |
1159 parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling); | 1159 parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling); |
1160 bool enabled = flag.compare("0") != 0; | 1160 bool enabled = flag.compare("0") != 0; |
1161 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(enabled); | 1161 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(enabled); |
1162 } else { | |
1163 #if defined(OS_WIN) | |
1164 // TODO(jar) 103209: Temporarilly default to disable for XP. | |
1165 if (base::win::GetVersion() <= base::win::VERSION_XP) | |
1166 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(false); | |
1167 #endif // OS_WIN | |
1168 } | 1162 } |
1169 | 1163 |
1170 // This forces the TabCloseableStateWatcher to be created and, on chromeos, | 1164 // This forces the TabCloseableStateWatcher to be created and, on chromeos, |
1171 // register for the notifications it needs to track the closeable state of | 1165 // register for the notifications it needs to track the closeable state of |
1172 // tabs. | 1166 // tabs. |
1173 g_browser_process->tab_closeable_state_watcher(); | 1167 g_browser_process->tab_closeable_state_watcher(); |
1174 | 1168 |
1175 local_state_ = InitializeLocalState(parsed_command_line(), | 1169 local_state_ = InitializeLocalState(parsed_command_line(), |
1176 is_first_run_); | 1170 is_first_run_); |
1177 | 1171 |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1992 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1986 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1993 uma_name += "_XP"; | 1987 uma_name += "_XP"; |
1994 | 1988 |
1995 uma_name += "_PreRead"; | 1989 uma_name += "_PreRead"; |
1996 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; | 1990 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; |
1997 AddPreReadHistogramTime(uma_name.c_str(), time); | 1991 AddPreReadHistogramTime(uma_name.c_str(), time); |
1998 } | 1992 } |
1999 #endif | 1993 #endif |
2000 #endif | 1994 #endif |
2001 } | 1995 } |
OLD | NEW |