OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/common/chrome_content_client.h" | 5 #include "chrome/common/chrome_content_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/cpu.h" | 8 #include "base/cpu.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiFlashPath)) | 262 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiFlashPath)) |
263 return false; | 263 return false; |
264 | 264 |
265 bool force_disable = CommandLine::ForCurrentProcess()->HasSwitch( | 265 bool force_disable = CommandLine::ForCurrentProcess()->HasSwitch( |
266 switches::kDisableBundledPpapiFlash); | 266 switches::kDisableBundledPpapiFlash); |
267 if (force_disable) | 267 if (force_disable) |
268 return false; | 268 return false; |
269 | 269 |
270 // For Linux ia32, Flapper requires SSE2. | 270 // For Linux ia32, Flapper requires SSE2. |
271 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) | 271 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) |
272 if (!base::CPU()::has_sse2()) | 272 if (!base::CPU().has_sse2()) |
273 return false; | 273 return false; |
274 #endif // ARCH_CPU_X86 | 274 #endif // ARCH_CPU_X86 |
275 | 275 |
276 FilePath flash_path; | 276 FilePath flash_path; |
277 if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path)) | 277 if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path)) |
278 return false; | 278 return false; |
279 // It is an error to have FLAPPER_AVAILABLE defined but then not having the | 279 // It is an error to have FLAPPER_AVAILABLE defined but then not having the |
280 // plugin file in place, but this happens in Chrome OS builds. | 280 // plugin file in place, but this happens in Chrome OS builds. |
281 // Use --disable-bundled-ppapi-flash to skip this. | 281 // Use --disable-bundled-ppapi-flash to skip this. |
282 DCHECK(file_util::PathExists(flash_path)); | 282 DCHECK(file_util::PathExists(flash_path)); |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
506 | 506 |
507 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( | 507 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( |
508 content::PepperPluginInfo* plugin, | 508 content::PepperPluginInfo* plugin, |
509 bool* override_npapi_flash) { | 509 bool* override_npapi_flash) { |
510 if (!ConductingPepperFlashFieldTrial()) | 510 if (!ConductingPepperFlashFieldTrial()) |
511 return false; | 511 return false; |
512 return GetBundledPepperFlash(plugin, override_npapi_flash); | 512 return GetBundledPepperFlash(plugin, override_npapi_flash); |
513 } | 513 } |
514 | 514 |
515 } // namespace chrome | 515 } // namespace chrome |
OLD | NEW |