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