| 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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 RegisterOriginTrialsComponent(cus, path); | 518 RegisterOriginTrialsComponent(cus, path); |
| 519 | 519 |
| 520 RegisterFileTypePoliciesComponent(cus, path); | 520 RegisterFileTypePoliciesComponent(cus, path); |
| 521 | 521 |
| 522 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) | 522 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) |
| 523 RegisterSSLErrorAssistantComponent(cus, path); | 523 RegisterSSLErrorAssistantComponent(cus, path); |
| 524 #endif | 524 #endif |
| 525 } | 525 } |
| 526 | 526 |
| 527 #if defined(OS_WIN) | 527 #if defined(OS_WIN) |
| 528 #if defined(GOOGLE_CHROME_BUILD) | 528 // DO NOT SUBMIT - Forces RegisterSwReporterComponent for debugging. |
| 529 // #if defined(GOOGLE_CHROME_BUILD) |
| 529 RegisterSwReporterComponent(cus); | 530 RegisterSwReporterComponent(cus); |
| 530 #endif // defined(GOOGLE_CHROME_BUILD) | 531 // #endif // defined(GOOGLE_CHROME_BUILD) |
| 531 #endif // defined(OS_WIN) | 532 #endif // defined(OS_WIN) |
| 532 } | 533 } |
| 533 | 534 |
| 534 #if !defined(OS_ANDROID) | 535 #if !defined(OS_ANDROID) |
| 535 bool ProcessSingletonNotificationCallback( | 536 bool ProcessSingletonNotificationCallback( |
| 536 const base::CommandLine& command_line, | 537 const base::CommandLine& command_line, |
| 537 const base::FilePath& current_directory) { | 538 const base::FilePath& current_directory) { |
| 538 // Drop the request if the browser process is already in shutdown path. | 539 // Drop the request if the browser process is already in shutdown path. |
| 539 if (!g_browser_process || g_browser_process->IsShuttingDown()) | 540 if (!g_browser_process || g_browser_process->IsShuttingDown()) |
| 540 return false; | 541 return false; |
| (...skipping 1552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2093 chromeos::CrosSettings::Shutdown(); | 2094 chromeos::CrosSettings::Shutdown(); |
| 2094 #endif // defined(OS_CHROMEOS) | 2095 #endif // defined(OS_CHROMEOS) |
| 2095 #endif // defined(OS_ANDROID) | 2096 #endif // defined(OS_ANDROID) |
| 2096 } | 2097 } |
| 2097 | 2098 |
| 2098 // Public members: | 2099 // Public members: |
| 2099 | 2100 |
| 2100 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2101 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2101 chrome_extra_parts_.push_back(parts); | 2102 chrome_extra_parts_.push_back(parts); |
| 2102 } | 2103 } |
| OLD | NEW |