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

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

Issue 8964002: Revert 114229 - Revert 113748 - Provide windows notifictaion of thread termination (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 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 } else { 1274 } else {
1275 browser_process_.reset(new BrowserProcessImpl(parsed_command_line())); 1275 browser_process_.reset(new BrowserProcessImpl(parsed_command_line()));
1276 } 1276 }
1277 1277
1278 if (parsed_command_line().HasSwitch(switches::kEnableProfiling)) { 1278 if (parsed_command_line().HasSwitch(switches::kEnableProfiling)) {
1279 // User wants to override default tracking status. 1279 // User wants to override default tracking status.
1280 std::string flag = 1280 std::string flag =
1281 parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling); 1281 parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling);
1282 bool enabled = flag.compare("0") != 0; 1282 bool enabled = flag.compare("0") != 0;
1283 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(enabled); 1283 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(enabled);
1284 } else {
1285 #if defined(OS_WIN)
1286 // TODO(jar) 103209: Temporarilly default to disable for XP.
1287 if (base::win::GetVersion() <= base::win::VERSION_XP)
1288 tracked_objects::ThreadData::InitializeAndSetTrackingStatus(false);
1289 #endif // OS_WIN
1290 } 1284 }
1291 1285
1292 // This forces the TabCloseableStateWatcher to be created and, on chromeos, 1286 // This forces the TabCloseableStateWatcher to be created and, on chromeos,
1293 // register for the notifications it needs to track the closeable state of 1287 // register for the notifications it needs to track the closeable state of
1294 // tabs. 1288 // tabs.
1295 g_browser_process->tab_closeable_state_watcher(); 1289 g_browser_process->tab_closeable_state_watcher();
1296 1290
1297 local_state_ = InitializeLocalState(parsed_command_line(), 1291 local_state_ = InitializeLocalState(parsed_command_line(),
1298 is_first_run_); 1292 is_first_run_);
1299 1293
(...skipping 892 matching lines...) Expand 10 before | Expand all | Expand 10 after
2192 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2186 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2193 (pre_read == "0" || pre_read == "1")) { 2187 (pre_read == "0" || pre_read == "1")) {
2194 std::string uma_name(name); 2188 std::string uma_name(name);
2195 uma_name += "_PreRead"; 2189 uma_name += "_PreRead";
2196 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2190 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2197 AddPreReadHistogramTime(uma_name.c_str(), time); 2191 AddPreReadHistogramTime(uma_name.c_str(), time);
2198 } 2192 }
2199 #endif 2193 #endif
2200 #endif 2194 #endif
2201 } 2195 }
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