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 <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
462 // For Chrome OS this registration is delayed until user login. | 462 // For Chrome OS this registration is delayed until user login. |
463 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); | 463 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); |
464 // Registration of the EV Whitelist component here is not necessary for: | 464 // Registration of the EV Whitelist component here is not necessary for: |
465 // 1. Android: Because it currently does not have the EV indicator. | 465 // 1. Android: Because it currently does not have the EV indicator. |
466 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. | 466 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. |
467 RegisterEVWhitelistComponent(cus, path); | 467 RegisterEVWhitelistComponent(cus, path); |
468 #endif // defined(OS_ANDROID) | 468 #endif // defined(OS_ANDROID) |
469 } | 469 } |
470 | 470 |
471 #if defined(OS_WIN) | 471 #if defined(OS_WIN) |
472 #if defined(OFFICIAL_BUILD) | |
csharp
2015/06/22 18:31:42
IS official build only true for Chrome builds?
MAD
2015/06/22 23:21:43
Done.
| |
472 RegisterSwReporterComponent(cus, g_browser_process->local_state()); | 473 RegisterSwReporterComponent(cus, g_browser_process->local_state()); |
474 #endif // defined(OFFICIAL_BUILD) | |
473 RegisterCAPSComponent(cus); | 475 RegisterCAPSComponent(cus); |
474 #endif // defined(OS_WIN) | 476 #endif // defined(OS_WIN) |
475 } | 477 } |
476 | 478 |
477 #if !defined(OS_ANDROID) | 479 #if !defined(OS_ANDROID) |
478 bool ProcessSingletonNotificationCallback( | 480 bool ProcessSingletonNotificationCallback( |
479 const base::CommandLine& command_line, | 481 const base::CommandLine& command_line, |
480 const base::FilePath& current_directory) { | 482 const base::FilePath& current_directory) { |
481 // Drop the request if the browser process is already in shutdown path. | 483 // Drop the request if the browser process is already in shutdown path. |
482 if (!g_browser_process || g_browser_process->IsShuttingDown()) { | 484 if (!g_browser_process || g_browser_process->IsShuttingDown()) { |
(...skipping 1271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1754 chromeos::CrosSettings::Shutdown(); | 1756 chromeos::CrosSettings::Shutdown(); |
1755 #endif // defined(OS_CHROMEOS) | 1757 #endif // defined(OS_CHROMEOS) |
1756 #endif // defined(OS_ANDROID) | 1758 #endif // defined(OS_ANDROID) |
1757 } | 1759 } |
1758 | 1760 |
1759 // Public members: | 1761 // Public members: |
1760 | 1762 |
1761 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1763 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1762 chrome_extra_parts_.push_back(parts); | 1764 chrome_extra_parts_.push_back(parts); |
1763 } | 1765 } |
OLD | NEW |