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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
(...skipping 1336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1347 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); | 1347 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); |
1348 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1348 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
1349 chrome_extra_parts_[i]->PreBrowserStart(); | 1349 chrome_extra_parts_[i]->PreBrowserStart(); |
1350 | 1350 |
1351 three_d_observer_.reset(new ThreeDAPIObserver()); | 1351 three_d_observer_.reset(new ThreeDAPIObserver()); |
1352 | 1352 |
1353 #if defined(SYZYASAN) | 1353 #if defined(SYZYASAN) |
1354 SetupSyzyASAN(); | 1354 SetupSyzyASAN(); |
1355 #endif | 1355 #endif |
1356 | 1356 |
| 1357 #if defined(OS_WIN) |
| 1358 ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial("ChromeWinClang", |
| 1359 #if defined(__clang__) |
| 1360 "Enabled" |
| 1361 #else |
| 1362 "Disabled" |
| 1363 #endif |
| 1364 ); |
| 1365 #endif |
| 1366 |
1357 // Start the tab manager here so that we give the most amount of time for the | 1367 // Start the tab manager here so that we give the most amount of time for the |
1358 // other services to start up before we start adjusting the oom priority. | 1368 // other services to start up before we start adjusting the oom priority. |
1359 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) | 1369 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |
1360 g_browser_process->GetTabManager()->Start(); | 1370 g_browser_process->GetTabManager()->Start(); |
1361 #endif | 1371 #endif |
1362 | 1372 |
1363 // The RulesetService will make the filtering rules available to renderers | 1373 // The RulesetService will make the filtering rules available to renderers |
1364 // immediately after its construction, provided that the rules are already | 1374 // immediately after its construction, provided that the rules are already |
1365 // available at no cost in an indexed format. This enables activating | 1375 // available at no cost in an indexed format. This enables activating |
1366 // subresource filtering, if needed, also for page loads on start-up. | 1376 // subresource filtering, if needed, also for page loads on start-up. |
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2100 chromeos::CrosSettings::Shutdown(); | 2110 chromeos::CrosSettings::Shutdown(); |
2101 #endif // defined(OS_CHROMEOS) | 2111 #endif // defined(OS_CHROMEOS) |
2102 #endif // defined(OS_ANDROID) | 2112 #endif // defined(OS_ANDROID) |
2103 } | 2113 } |
2104 | 2114 |
2105 // Public members: | 2115 // Public members: |
2106 | 2116 |
2107 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2117 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2108 chrome_extra_parts_.push_back(parts); | 2118 chrome_extra_parts_.push_back(parts); |
2109 } | 2119 } |
OLD | NEW |