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

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

Issue 8872047: Respect default browser policy (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | no next file » | 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 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1444 1444
1445 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1445 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1446 chrome_extra_parts_[i]->PreMainMessageLoopRun(); 1446 chrome_extra_parts_[i]->PreMainMessageLoopRun();
1447 } 1447 }
1448 1448
1449 int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { 1449 int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
1450 // Create watchdog thread after creating all other threads because it will 1450 // Create watchdog thread after creating all other threads because it will
1451 // watch the other threads and they must be running. 1451 // watch the other threads and they must be running.
1452 browser_process_->watchdog_thread(); 1452 browser_process_->watchdog_thread();
1453 1453
1454 // Do any initializating in the browser process that requires all threads
1455 // running.
1456 browser_process_->PreMainMessageLoopRun();
1457
1454 #if defined(USE_WEBKIT_COMPOSITOR) 1458 #if defined(USE_WEBKIT_COMPOSITOR)
1455 // We need to ensure WebKit has been initialized before we start the WebKit 1459 // We need to ensure WebKit has been initialized before we start the WebKit
1456 // compositor. This is done by the ResourceDispatcherHost on creation. 1460 // compositor. This is done by the ResourceDispatcherHost on creation.
1457 browser_process_->resource_dispatcher_host(); 1461 browser_process_->resource_dispatcher_host();
1458 #endif 1462 #endif
1459 1463
1460 #if defined(OS_CHROMEOS) 1464 #if defined(OS_CHROMEOS)
1461 // Now that the file thread exists we can record our stats. 1465 // Now that the file thread exists we can record our stats.
1462 chromeos::BootTimesLoader::Get()->RecordChromeMainStats(); 1466 chromeos::BootTimesLoader::Get()->RecordChromeMainStats();
1463 1467
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2159 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2156 (pre_read == "0" || pre_read == "1")) { 2160 (pre_read == "0" || pre_read == "1")) {
2157 std::string uma_name(name); 2161 std::string uma_name(name);
2158 uma_name += "_PreRead"; 2162 uma_name += "_PreRead";
2159 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2163 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2160 AddPreReadHistogramTime(uma_name.c_str(), time); 2164 AddPreReadHistogramTime(uma_name.c_str(), time);
2161 } 2165 }
2162 #endif 2166 #endif
2163 #endif 2167 #endif
2164 } 2168 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698