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 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 #endif | 426 #endif |
427 } | 427 } |
428 | 428 |
429 #if !defined(OS_ANDROID) | 429 #if !defined(OS_ANDROID) |
430 // Android does not currently have the EV indicator. No need to get the | 430 // Android does not currently have the EV indicator. No need to get the |
431 // EV certs whitelist on Android, then. | 431 // EV certs whitelist on Android, then. |
432 RegisterEVWhitelistComponent(cus); | 432 RegisterEVWhitelistComponent(cus); |
433 #endif | 433 #endif |
434 | 434 |
435 #if defined(OS_WIN) | 435 #if defined(OS_WIN) |
436 ExecutePendingSwReporter(cus, g_browser_process->local_state()); | 436 RegisterSwReporterComponent(cus, g_browser_process->local_state()); |
437 #endif | 437 #endif |
438 | 438 |
439 cus->Start(); | 439 cus->Start(); |
440 } | 440 } |
441 | 441 |
442 #if !defined(OS_ANDROID) | 442 #if !defined(OS_ANDROID) |
443 bool ProcessSingletonNotificationCallback( | 443 bool ProcessSingletonNotificationCallback( |
444 const CommandLine& command_line, | 444 const CommandLine& command_line, |
445 const base::FilePath& current_directory) { | 445 const base::FilePath& current_directory) { |
446 // Drop the request if the browser process is already in shutdown path. | 446 // Drop the request if the browser process is already in shutdown path. |
(...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1689 chromeos::CrosSettings::Shutdown(); | 1689 chromeos::CrosSettings::Shutdown(); |
1690 #endif | 1690 #endif |
1691 #endif | 1691 #endif |
1692 } | 1692 } |
1693 | 1693 |
1694 // Public members: | 1694 // Public members: |
1695 | 1695 |
1696 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1696 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1697 chrome_extra_parts_.push_back(parts); | 1697 chrome_extra_parts_.push_back(parts); |
1698 } | 1698 } |
OLD | NEW |