Index: chrome/browser/ui/browser_init.cc |
=================================================================== |
--- chrome/browser/ui/browser_init.cc (revision 96104) |
+++ chrome/browser/ui/browser_init.cc (working copy) |
@@ -22,8 +22,10 @@ |
#include "chrome/browser/automation/chrome_frame_automation_provider.h" |
#include "chrome/browser/automation/testing_automation_provider.h" |
#include "chrome/browser/browser_process.h" |
+#include "chrome/browser/component_updater/component_updater_service.h" |
+#include "chrome/browser/component_updater/pepper_flash_component_installer.h" |
+#include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
#include "chrome/browser/defaults.h" |
-#include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
#include "chrome/browser/extensions/extension_creator.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/pack_extension_job.h" |
@@ -509,6 +511,17 @@ |
} |
} |
+void RegisterComponentsForUpdate() { |
+ ComponentUpdateService* cus = g_browser_process->component_updater(); |
+ if (!cus) |
+ return; |
+ // Registration can be before of after cus->Start() so it is ok to post |
+ // a task to the UI thread to do registration once you done the necessary |
+ // file IO to know your current version. |
+ RegisterPepperFlashComponent(cus); |
+ cus->Start(); |
+} |
+ |
} // namespace |
@@ -1320,6 +1333,8 @@ |
if (command_line.HasSwitch(switches::kDisablePromptOnRepost)) |
NavigationController::DisablePromptOnRepost(); |
+ RegisterComponentsForUpdate(); |
+ |
// Look for the testing channel ID ONLY during process startup |
if (command_line.HasSwitch(switches::kTestingChannelID)) { |
std::string testing_channel_id = command_line.GetSwitchValueASCII( |