Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1515)

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 8839001: Revert 113321 (speculative revert for http://crbug.com/106657 and a few other problems) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/win/dllmain.cc ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1242 } else { 1242 } else {
1243 browser_process_.reset(new BrowserProcessImpl(parsed_command_line())); 1243 browser_process_.reset(new BrowserProcessImpl(parsed_command_line()));
1244 } 1244 }
1245 1245
1246 if (parsed_command_line().HasSwitch(switches::kEnableProfiling)) { 1246 if (parsed_command_line().HasSwitch(switches::kEnableProfiling)) {
1247 // User wants to override default tracking status. 1247 // User wants to override default tracking status.
1248 std::string flag = 1248 std::string flag =
1249 parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling); 1249 parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling);
1250 bool enabled = flag.compare("0") != 0; 1250 bool enabled = flag.compare("0") != 0;
1251 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(enabled); 1251 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(enabled);
1252 } else {
1253 #if defined(OS_WIN)
1254 // TODO(jar) 103209: Temporarilly default to disable for XP.
1255 if (base::win::GetVersion() <= base::win::VERSION_XP)
1256 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(false);
1257 #endif // OS_WIN
1252 } 1258 }
1253 1259
1254 // This forces the TabCloseableStateWatcher to be created and, on chromeos, 1260 // This forces the TabCloseableStateWatcher to be created and, on chromeos,
1255 // register for the notifications it needs to track the closeable state of 1261 // register for the notifications it needs to track the closeable state of
1256 // tabs. 1262 // tabs.
1257 g_browser_process->tab_closeable_state_watcher(); 1263 g_browser_process->tab_closeable_state_watcher();
1258 1264
1259 local_state_ = InitializeLocalState(parsed_command_line(), 1265 local_state_ = InitializeLocalState(parsed_command_line(),
1260 is_first_run_); 1266 is_first_run_);
1261 1267
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
2149 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2155 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2150 (pre_read == "0" || pre_read == "1")) { 2156 (pre_read == "0" || pre_read == "1")) {
2151 std::string uma_name(name); 2157 std::string uma_name(name);
2152 uma_name += "_PreRead"; 2158 uma_name += "_PreRead";
2153 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2159 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2154 AddPreReadHistogramTime(uma_name.c_str(), time); 2160 AddPreReadHistogramTime(uma_name.c_str(), time);
2155 } 2161 }
2156 #endif 2162 #endif
2157 #endif 2163 #endif
2158 } 2164 }
OLDNEW
« no previous file with comments | « base/win/dllmain.cc ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698