| 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 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 5 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
| 6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 virtual bool SandboxPlugin(CommandLine* command_line, | 39 virtual bool SandboxPlugin(CommandLine* command_line, |
| 40 sandbox::TargetPolicy* policy) OVERRIDE; | 40 sandbox::TargetPolicy* policy) OVERRIDE; |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 #if defined(OS_MACOSX) | 43 #if defined(OS_MACOSX) |
| 44 virtual bool GetSandboxProfileForSandboxType( | 44 virtual bool GetSandboxProfileForSandboxType( |
| 45 int sandbox_type, | 45 int sandbox_type, |
| 46 int* sandbox_profile_resource_id) const OVERRIDE; | 46 int* sandbox_profile_resource_id) const OVERRIDE; |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 // Gets information about the bundled Pepper Flash. |override_npapi_flash| | 49 // Gets information about the bundled Pepper Flash for field trial. |
| 50 // indicates whether it should take precedence over the internal NPAPI Flash. | 50 // |override_npapi_flash| indicates whether it should take precedence over |
| 51 // the internal NPAPI Flash. |
| 51 // Returns false if bundled Pepper Flash is not available. In that case, | 52 // Returns false if bundled Pepper Flash is not available. In that case, |
| 52 // |plugin| and |override_npapi_flash| are not touched. | 53 // |plugin| and |override_npapi_flash| are not touched. |
| 53 // | 54 // |
| 54 // TODO(yzshen): We need this method because currently we are having a field | 55 // TODO(yzshen): We need this method because currently we are having a field |
| 55 // trial with bundled Pepper Flash, and need extra information about how to | 56 // trial with bundled Pepper Flash, and need extra information about how to |
| 56 // order bundled Pepper Flash and internal NPAPI Flash. Once the field trial | 57 // order bundled Pepper Flash and internal NPAPI Flash. Once the field trial |
| 57 // is over, we should merge this into AddPepperPlugins(). | 58 // is over, we should merge this into AddPepperPlugins(). |
| 58 bool GetBundledPepperFlash(content::PepperPluginInfo* plugin, | 59 bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin, |
| 59 bool* override_npapi_flash); | 60 bool* override_npapi_flash); |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 } // namespace chrome | 63 } // namespace chrome |
| 63 | 64 |
| 64 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 65 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
| OLD | NEW |