| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/pepper_flash_component_installer.h" | 5 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #endif // defined(OS_CHROMEOS) | 55 #endif // defined(OS_CHROMEOS) |
| 56 | 56 |
| 57 using content::BrowserThread; | 57 using content::BrowserThread; |
| 58 using content::PluginService; | 58 using content::PluginService; |
| 59 | 59 |
| 60 namespace component_updater { | 60 namespace component_updater { |
| 61 | 61 |
| 62 namespace { | 62 namespace { |
| 63 | 63 |
| 64 #if defined(GOOGLE_CHROME_BUILD) | 64 #if defined(GOOGLE_CHROME_BUILD) |
| 65 #if defined(OS_CHROMEOS) |
| 66 // CRX hash for Chrome OS. The extension id is: |
| 67 // ckjlcfmdbdglblbjglepgnoekdnkoklc. |
| 68 const uint8_t kSha2Hash[] = {0x2a, 0x9b, 0x25, 0xc3, 0x13, 0x6b, 0x1b, 0x19, |
| 69 0x6b, 0x4f, 0x6d, 0xe4, 0xa3, 0xda, 0xea, 0xb2, |
| 70 0x67, 0xeb, 0xf0, 0xbb, 0x1f, 0x48, 0xa2, 0x73, |
| 71 0xea, 0x47, 0x11, 0xc8, 0x2b, 0xd9, 0x03, 0xb5}; |
| 72 #else |
| 65 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb. | 73 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb. |
| 66 const uint8_t kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20, | 74 const uint8_t kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20, |
| 67 0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11, | 75 0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11, |
| 68 0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70, | 76 0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70, |
| 69 0x54, 0xf9, 0x56, 0xd3, 0xe7, 0x88, 0xba, 0x8c}; | 77 0x54, 0xf9, 0x56, 0xd3, 0xe7, 0x88, 0xba, 0x8c}; |
| 78 #endif // defined(OS_CHROMEOS) |
| 70 | 79 |
| 71 #if defined(OS_CHROMEOS) | 80 #if defined(OS_CHROMEOS) |
| 72 void LogRegistrationResult(chromeos::DBusMethodCallStatus call_status, | 81 void LogRegistrationResult(chromeos::DBusMethodCallStatus call_status, |
| 73 bool result) { | 82 bool result) { |
| 74 if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS) { | 83 if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS) { |
| 75 LOG(ERROR) << "Call to imageloader service failed."; | 84 LOG(ERROR) << "Call to imageloader service failed."; |
| 76 return; | 85 return; |
| 77 } | 86 } |
| 78 if (!result) | 87 if (!result) |
| 79 LOG(ERROR) << "Component flash registration failed"; | 88 LOG(ERROR) << "Component flash registration failed"; |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 std::unique_ptr<ComponentInstallerTraits> traits( | 326 std::unique_ptr<ComponentInstallerTraits> traits( |
| 318 new FlashComponentInstallerTraits); | 327 new FlashComponentInstallerTraits); |
| 319 // |cus| will take ownership of |installer| during installer->Register(cus). | 328 // |cus| will take ownership of |installer| during installer->Register(cus). |
| 320 DefaultComponentInstaller* installer = | 329 DefaultComponentInstaller* installer = |
| 321 new DefaultComponentInstaller(std::move(traits)); | 330 new DefaultComponentInstaller(std::move(traits)); |
| 322 installer->Register(cus, base::Closure()); | 331 installer->Register(cus, base::Closure()); |
| 323 #endif // defined(GOOGLE_CHROME_BUILD) | 332 #endif // defined(GOOGLE_CHROME_BUILD) |
| 324 } | 333 } |
| 325 | 334 |
| 326 } // namespace component_updater | 335 } // namespace component_updater |
| OLD | NEW |