| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/component_updater/flash_component_installer.h" | 5 #include "chrome/browser/component_updater/flash_component_installer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 // probably somebody (unknowingly) will pay for the file IO, so usually get | 205 // probably somebody (unknowingly) will pay for the file IO, so usually get |
| 206 // the information for free. | 206 // the information for free. |
| 207 void RegisterNPAPIFlashComponent(ComponentUpdateService* cus) { | 207 void RegisterNPAPIFlashComponent(ComponentUpdateService* cus) { |
| 208 #if !defined(OS_CHROMEOS) | 208 #if !defined(OS_CHROMEOS) |
| 209 FilePath path = GetNPAPIFlashBaseDirectory().Append(kFlashPluginFileName); | 209 FilePath path = GetNPAPIFlashBaseDirectory().Append(kFlashPluginFileName); |
| 210 PluginService::GetInstance()->AddExtraPluginPath(path); | 210 PluginService::GetInstance()->AddExtraPluginPath(path); |
| 211 PluginService::GetInstance()->RefreshPlugins(); | 211 PluginService::GetInstance()->RefreshPlugins(); |
| 212 | 212 |
| 213 // Post the task to the FILE thread because IO may be done once the plugins | 213 // Post the task to the FILE thread because IO may be done once the plugins |
| 214 // are loaded. | 214 // are loaded. |
| 215 BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE, | 215 BrowserThread::PostDelayedTask( |
| 216 BrowserThread::FILE, |
| 217 FROM_HERE, |
| 216 base::Bind(&PluginService::GetPlugins, | 218 base::Bind(&PluginService::GetPlugins, |
| 217 base::Unretained(PluginService::GetInstance()), | 219 base::Unretained(PluginService::GetInstance()), |
| 218 base::Bind(&StartFlashUpdateRegistration, cus)), | 220 base::Bind(&StartFlashUpdateRegistration, cus)), |
| 219 8000); | 221 base::TimeDelta::FromSeconds(8)); |
| 220 #endif | 222 #endif |
| 221 } | 223 } |
| OLD | NEW |