| 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 <string.h> | 5 #include <string.h> |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 #include "base/file_util.h" | 13 #include "base/file_util.h" |
| 14 #include "base/files/file_enumerator.h" | 14 #include "base/files/file_enumerator.h" |
| 15 #include "base/files/file_path.h" | 15 #include "base/files/file_path.h" |
| 16 #include "base/logging.h" | 16 #include "base/logging.h" |
| 17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
| 18 #include "base/strings/string_split.h" | 18 #include "base/strings/string_split.h" |
| 19 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
| 20 #include "base/strings/stringprintf.h" | 20 #include "base/strings/stringprintf.h" |
| 21 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
| 22 #include "base/values.h" | 22 #include "base/values.h" |
| 23 #include "base/version.h" | 23 #include "base/version.h" |
| 24 #include "build/build_config.h" | 24 #include "build/build_config.h" |
| 25 #include "chrome/browser/component_updater/component_updater_service.h" | |
| 26 #include "chrome/browser/component_updater/flash_component_installer.h" | 25 #include "chrome/browser/component_updater/flash_component_installer.h" |
| 27 #include "chrome/browser/component_updater/ppapi_utils.h" | 26 #include "chrome/browser/component_updater/ppapi_utils.h" |
| 28 #include "chrome/browser/plugins/plugin_prefs.h" | 27 #include "chrome/browser/plugins/plugin_prefs.h" |
| 29 #include "chrome/common/chrome_constants.h" | 28 #include "chrome/common/chrome_constants.h" |
| 30 #include "chrome/common/chrome_paths.h" | 29 #include "chrome/common/chrome_paths.h" |
| 31 #include "chrome/common/chrome_switches.h" | 30 #include "chrome/common/chrome_switches.h" |
| 32 #include "chrome/common/pepper_flash.h" | 31 #include "chrome/common/pepper_flash.h" |
| 32 #include "components/component_updater/component_updater_service.h" |
| 33 #include "content/public/browser/browser_thread.h" | 33 #include "content/public/browser/browser_thread.h" |
| 34 #include "content/public/browser/plugin_service.h" | 34 #include "content/public/browser/plugin_service.h" |
| 35 #include "content/public/common/content_constants.h" | 35 #include "content/public/common/content_constants.h" |
| 36 #include "content/public/common/pepper_plugin_info.h" | 36 #include "content/public/common/pepper_plugin_info.h" |
| 37 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. NOLINT | 37 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. NOLINT |
| 38 #include "ppapi/c/private/ppb_pdf.h" | 38 #include "ppapi/c/private/ppb_pdf.h" |
| 39 #include "ppapi/shared_impl/ppapi_permissions.h" | 39 #include "ppapi/shared_impl/ppapi_permissions.h" |
| 40 | 40 |
| 41 using content::BrowserThread; | 41 using content::BrowserThread; |
| 42 using content::PluginService; | 42 using content::PluginService; |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 507 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 507 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
| 508 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) | 508 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) |
| 509 return; | 509 return; |
| 510 BrowserThread::PostTask(BrowserThread::FILE, | 510 BrowserThread::PostTask(BrowserThread::FILE, |
| 511 FROM_HERE, | 511 FROM_HERE, |
| 512 base::Bind(&StartPepperFlashUpdateRegistration, cus)); | 512 base::Bind(&StartPepperFlashUpdateRegistration, cus)); |
| 513 #endif | 513 #endif |
| 514 } | 514 } |
| 515 | 515 |
| 516 } // namespace component_updater | 516 } // namespace component_updater |
| OLD | NEW |