| 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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 } | 385 } |
| 386 | 386 |
| 387 #if defined(OS_MACOSX) | 387 #if defined(OS_MACOSX) |
| 388 OSStatus KeychainCallback(SecKeychainEvent keychain_event, | 388 OSStatus KeychainCallback(SecKeychainEvent keychain_event, |
| 389 SecKeychainCallbackInfo* info, void* context) { | 389 SecKeychainCallbackInfo* info, void* context) { |
| 390 return noErr; | 390 return noErr; |
| 391 } | 391 } |
| 392 #endif | 392 #endif |
| 393 | 393 |
| 394 void RegisterComponentsForUpdate(const CommandLine& command_line) { | 394 void RegisterComponentsForUpdate(const CommandLine& command_line) { |
| 395 ComponentUpdateService* cus = g_browser_process->component_updater(); | 395 component_updater::ComponentUpdateService* cus = |
| 396 g_browser_process->component_updater(); |
| 396 | 397 |
| 397 // Registration can be before or after cus->Start() so it is ok to post | 398 // Registration can be before or after cus->Start() so it is ok to post |
| 398 // a task to the UI thread to do registration once you done the necessary | 399 // a task to the UI thread to do registration once you done the necessary |
| 399 // file IO to know you existing component version. | 400 // file IO to know you existing component version. |
| 400 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 401 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
| 401 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 402 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
| 402 RegisterPepperFlashComponent(cus); | 403 RegisterPepperFlashComponent(cus); |
| 403 RegisterSwiftShaderComponent(cus); | 404 RegisterSwiftShaderComponent(cus); |
| 404 #endif | 405 #endif |
| 405 | 406 |
| (...skipping 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1675 chromeos::CrosSettings::Shutdown(); | 1676 chromeos::CrosSettings::Shutdown(); |
| 1676 #endif | 1677 #endif |
| 1677 #endif | 1678 #endif |
| 1678 } | 1679 } |
| 1679 | 1680 |
| 1680 // Public members: | 1681 // Public members: |
| 1681 | 1682 |
| 1682 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1683 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1683 chrome_extra_parts_.push_back(parts); | 1684 chrome_extra_parts_.push_back(parts); |
| 1684 } | 1685 } |
| OLD | NEW |