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 13 matching lines...) Expand all Loading... |
24 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.h" |
25 #include "content/public/common/content_switches.h" | 25 #include "content/public/common/content_switches.h" |
26 #include "content/public/common/pepper_plugin_info.h" | 26 #include "content/public/common/pepper_plugin_info.h" |
27 #include "content/public/common/url_constants.h" | 27 #include "content/public/common/url_constants.h" |
28 #include "grit/common_resources.h" | 28 #include "grit/common_resources.h" |
29 #include "ppapi/shared_impl/ppapi_permissions.h" | 29 #include "ppapi/shared_impl/ppapi_permissions.h" |
30 #include "remoting/client/plugin/pepper_entrypoints.h" | 30 #include "remoting/client/plugin/pepper_entrypoints.h" |
31 #include "ui/base/l10n/l10n_util.h" | 31 #include "ui/base/l10n/l10n_util.h" |
32 #include "ui/base/layout.h" | 32 #include "ui/base/layout.h" |
33 #include "ui/base/resource/resource_bundle.h" | 33 #include "ui/base/resource/resource_bundle.h" |
34 #include "webkit/glue/user_agent.h" | |
35 #include "webkit/plugins/npapi/plugin_list.h" | 34 #include "webkit/plugins/npapi/plugin_list.h" |
36 #include "webkit/plugins/plugin_constants.h" | 35 #include "webkit/plugins/plugin_constants.h" |
| 36 #include "webkit/user_agent/user_agent_util.h" |
37 | 37 |
38 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. | 38 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. |
39 | 39 |
40 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
41 #include "base/win/registry.h" | 41 #include "base/win/registry.h" |
42 #include "base/win/windows_version.h" | 42 #include "base/win/windows_version.h" |
43 #include "sandbox/win/src/sandbox.h" | 43 #include "sandbox/win/src/sandbox.h" |
44 #elif defined(OS_MACOSX) | 44 #elif defined(OS_MACOSX) |
45 #include "chrome/common/chrome_sandbox_type_mac.h" | 45 #include "chrome/common/chrome_sandbox_type_mac.h" |
46 #endif | 46 #endif |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 | 541 |
542 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( | 542 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( |
543 content::PepperPluginInfo* plugin, | 543 content::PepperPluginInfo* plugin, |
544 bool* override_npapi_flash) { | 544 bool* override_npapi_flash) { |
545 if (!ConductingPepperFlashFieldTrial()) | 545 if (!ConductingPepperFlashFieldTrial()) |
546 return false; | 546 return false; |
547 return GetBundledPepperFlash(plugin, override_npapi_flash); | 547 return GetBundledPepperFlash(plugin, override_npapi_flash); |
548 } | 548 } |
549 | 549 |
550 } // namespace chrome | 550 } // namespace chrome |
OLD | NEW |