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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiFlashPath)) | 255 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiFlashPath)) |
256 return false; | 256 return false; |
257 | 257 |
258 bool force_disable = CommandLine::ForCurrentProcess()->HasSwitch( | 258 bool force_disable = CommandLine::ForCurrentProcess()->HasSwitch( |
259 switches::kDisableBundledPpapiFlash); | 259 switches::kDisableBundledPpapiFlash); |
260 if (force_disable) | 260 if (force_disable) |
261 return false; | 261 return false; |
262 | 262 |
263 // For Linux ia32, Flapper requires SSE2. | 263 // For Linux ia32, Flapper requires SSE2. |
264 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) | 264 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) |
265 if (!base::CPU()::has_sse2()) | 265 if (!base::CPU().has_sse2()) |
266 return false; | 266 return false; |
267 #endif // ARCH_CPU_X86 | 267 #endif // ARCH_CPU_X86 |
268 | 268 |
269 FilePath flash_path; | 269 FilePath flash_path; |
270 if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path)) | 270 if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path)) |
271 return false; | 271 return false; |
272 // It is an error to have FLAPPER_AVAILABLE defined but then not having the | 272 // It is an error to have FLAPPER_AVAILABLE defined but then not having the |
273 // plugin file in place, but this happens in Chrome OS builds. | 273 // plugin file in place, but this happens in Chrome OS builds. |
274 // Use --disable-bundled-ppapi-flash to skip this. | 274 // Use --disable-bundled-ppapi-flash to skip this. |
275 DCHECK(file_util::PathExists(flash_path)); | 275 DCHECK(file_util::PathExists(flash_path)); |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 | 514 |
515 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( | 515 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( |
516 content::PepperPluginInfo* plugin, | 516 content::PepperPluginInfo* plugin, |
517 bool* override_npapi_flash) { | 517 bool* override_npapi_flash) { |
518 if (!ConductingPepperFlashFieldTrial()) | 518 if (!ConductingPepperFlashFieldTrial()) |
519 return false; | 519 return false; |
520 return GetBundledPepperFlash(plugin, override_npapi_flash); | 520 return GetBundledPepperFlash(plugin, override_npapi_flash); |
521 } | 521 } |
522 | 522 |
523 } // namespace chrome | 523 } // namespace chrome |
OLD | NEW |