| 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 "content/child/npapi/plugin_host.h" | 5 #include "content/child/npapi/plugin_host.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "content/public/common/content_switches.h" | 22 #include "content/public/common/content_switches.h" |
| 23 #include "content/public/common/user_agent.h" | 23 #include "content/public/common/user_agent.h" |
| 24 #include "content/public/common/webplugininfo.h" | 24 #include "content/public/common/webplugininfo.h" |
| 25 #include "net/base/filename_util.h" | 25 #include "net/base/filename_util.h" |
| 26 #include "third_party/WebKit/public/web/WebBindings.h" | 26 #include "third_party/WebKit/public/web/WebBindings.h" |
| 27 #include "third_party/WebKit/public/web/WebKit.h" | 27 #include "third_party/WebKit/public/web/WebKit.h" |
| 28 #include "third_party/npapi/bindings/npruntime.h" | 28 #include "third_party/npapi/bindings/npruntime.h" |
| 29 #include "ui/gl/gl_implementation.h" | 29 #include "ui/gl/gl_implementation.h" |
| 30 #include "ui/gl/gl_surface.h" | 30 #include "ui/gl/gl_surface.h" |
| 31 | 31 |
| 32 #if defined(OS_MACOSX) | |
| 33 #include "base/mac/mac_util.h" | |
| 34 #endif | |
| 35 | |
| 36 using blink::WebBindings; | 32 using blink::WebBindings; |
| 37 | 33 |
| 38 // Declarations for stub implementations of deprecated functions, which are no | 34 // Declarations for stub implementations of deprecated functions, which are no |
| 39 // longer listed in npapi.h. | 35 // longer listed in npapi.h. |
| 40 extern "C" { | 36 extern "C" { |
| 41 void* NPN_GetJavaEnv(); | 37 void* NPN_GetJavaEnv(); |
| 42 void* NPN_GetJavaPeer(NPP); | 38 void* NPN_GetJavaPeer(NPP); |
| 43 } | 39 } |
| 44 | 40 |
| 45 namespace content { | 41 namespace content { |
| (...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 } | 1097 } |
| 1102 | 1098 |
| 1103 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) { | 1099 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) { |
| 1104 scoped_refptr<PluginInstance> plugin(FindInstance(instance)); | 1100 scoped_refptr<PluginInstance> plugin(FindInstance(instance)); |
| 1105 if (plugin.get()) { | 1101 if (plugin.get()) { |
| 1106 plugin->URLRedirectResponse(!!allow, notify_data); | 1102 plugin->URLRedirectResponse(!!allow, notify_data); |
| 1107 } | 1103 } |
| 1108 } | 1104 } |
| 1109 | 1105 |
| 1110 } // extern "C" | 1106 } // extern "C" |
| OLD | NEW |