| 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 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 #endif | 415 #endif |
| 416 } | 416 } |
| 417 | 417 |
| 418 #if !defined(OS_ANDROID) | 418 #if !defined(OS_ANDROID) |
| 419 // Android does not currently have the EV indicator. No need to get the | 419 // Android does not currently have the EV indicator. No need to get the |
| 420 // EV certs whitelist on Android, then. | 420 // EV certs whitelist on Android, then. |
| 421 RegisterEVWhitelistComponent(cus); | 421 RegisterEVWhitelistComponent(cus); |
| 422 #endif | 422 #endif |
| 423 | 423 |
| 424 #if defined(OS_WIN) | 424 #if defined(OS_WIN) |
| 425 ExecutePendingSwReporter(cus, g_browser_process->local_state()); | 425 ExecuteSwReporterIfRequired(cus, g_browser_process->local_state()); |
| 426 #endif | 426 #endif |
| 427 | 427 |
| 428 cus->Start(); | 428 cus->Start(); |
| 429 } | 429 } |
| 430 | 430 |
| 431 #if !defined(OS_ANDROID) | 431 #if !defined(OS_ANDROID) |
| 432 bool ProcessSingletonNotificationCallback( | 432 bool ProcessSingletonNotificationCallback( |
| 433 const CommandLine& command_line, | 433 const CommandLine& command_line, |
| 434 const base::FilePath& current_directory) { | 434 const base::FilePath& current_directory) { |
| 435 // Drop the request if the browser process is already in shutdown path. | 435 // Drop the request if the browser process is already in shutdown path. |
| (...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1663 chromeos::CrosSettings::Shutdown(); | 1663 chromeos::CrosSettings::Shutdown(); |
| 1664 #endif | 1664 #endif |
| 1665 #endif | 1665 #endif |
| 1666 } | 1666 } |
| 1667 | 1667 |
| 1668 // Public members: | 1668 // Public members: |
| 1669 | 1669 |
| 1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1671 chrome_extra_parts_.push_back(parts); | 1671 chrome_extra_parts_.push_back(parts); |
| 1672 } | 1672 } |
| OLD | NEW |