| 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> |
| 8 |
| 7 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 8 #include "base/bind.h" | 10 #include "base/bind.h" |
| 9 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 10 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 11 #include "base/file_util.h" | 13 #include "base/file_util.h" |
| 12 #include "base/logging.h" | 14 #include "base/logging.h" |
| 13 #include "base/path_service.h" | 15 #include "base/path_service.h" |
| 14 #include "base/string_util.h" | 16 #include "base/string_util.h" |
| 15 #include "base/values.h" | 17 #include "base/values.h" |
| 16 #include "chrome/browser/component_updater/component_updater_service.h" | 18 #include "chrome/browser/component_updater/component_updater_service.h" |
| 17 #include "chrome/browser/plugin_prefs.h" | 19 #include "chrome/browser/plugin_prefs.h" |
| 18 #include "chrome/common/chrome_paths.h" | 20 #include "chrome/common/chrome_paths.h" |
| 19 #include "content/browser/plugin_service.h" | |
| 20 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
| 22 #include "content/public/browser/plugin_service.h" |
| 21 #include "webkit/plugins/webplugininfo.h" | 23 #include "webkit/plugins/webplugininfo.h" |
| 22 | 24 |
| 23 using content::BrowserThread; | 25 using content::BrowserThread; |
| 26 using content::PluginService; |
| 24 | 27 |
| 25 namespace { | 28 namespace { |
| 26 | 29 |
| 27 // CRX hash. The extension id is: immdilkhigodmjbnngapbehchmihabbg. | 30 // CRX hash. The extension id is: immdilkhigodmjbnngapbehchmihabbg. |
| 28 const uint8 sha2_hash[] = {0x8c, 0xc3, 0x8b, 0xa7, 0x86, 0xe3, 0xc9, 0x1d, | 31 const uint8 sha2_hash[] = {0x8c, 0xc3, 0x8b, 0xa7, 0x86, 0xe3, 0xc9, 0x1d, |
| 29 0xd6, 0x0f, 0x14, 0x72, 0x7c, 0x87, 0x01, 0x16, | 32 0xd6, 0x0f, 0x14, 0x72, 0x7c, 0x87, 0x01, 0x16, |
| 30 0xe2, 0x00, 0x6c, 0x98, 0xbc, 0xfb, 0x14, 0x1b, | 33 0xe2, 0x00, 0x6c, 0x98, 0xbc, 0xfb, 0x14, 0x1b, |
| 31 0x5c, 0xcd, 0xff, 0x3d, 0xa3, 0x2e, 0x2c, 0x49}; | 34 0x5c, 0xcd, 0xff, 0x3d, 0xa3, 0x2e, 0x2c, 0x49}; |
| 32 | 35 |
| 33 // File name of the internal Flash plugin on different platforms. | 36 // File name of the internal Flash plugin on different platforms. |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 | 212 |
| 210 // 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 |
| 211 // are loaded. | 214 // are loaded. |
| 212 BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE, | 215 BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE, |
| 213 base::Bind(&PluginService::GetPlugins, | 216 base::Bind(&PluginService::GetPlugins, |
| 214 base::Unretained(PluginService::GetInstance()), | 217 base::Unretained(PluginService::GetInstance()), |
| 215 base::Bind(&StartFlashUpdateRegistration, cus)), | 218 base::Bind(&StartFlashUpdateRegistration, cus)), |
| 216 8000); | 219 8000); |
| 217 #endif | 220 #endif |
| 218 } | 221 } |
| OLD | NEW |