webkit/plugins/npapi/plugin_host.cc - Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/.

Side by Side Diff: webkit/plugins/npapi/plugin_host.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix mac_rel Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « webkit/gpu/webkit_gpu.gypi ('k') | webkit/plugins/npapi/webplugin.h » ('j') | no next file with comments »

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 "webkit/plugins/npapi/plugin_host.h"	5 #include "webkit/plugins/npapi/plugin_host.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/file_util.h"	8 #include "base/file_util.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/string_piece.h"	11 #include "base/string_piece.h"

12 #include "base/string_util.h"	12 #include "base/string_util.h"

13 #include "base/sys_string_conversions.h"	13 #include "base/sys_string_conversions.h"

14 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

15 #include "build/build_config.h"	15 #include "build/build_config.h"

16 #include "net/base/net_util.h"	16 #include "net/base/net_util.h"

17 #include "third_party/npapi/bindings/npruntime.h"

18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"	17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"

19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"	18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"

	19 #include "third_party/npapi/bindings/npruntime.h"

20 #include "ui/base/ui_base_switches.h"	20 #include "ui/base/ui_base_switches.h"

21 #include "ui/gfx/gl/gl_implementation.h"	21 #include "ui/gl/gl_implementation.h"

22 #include "ui/gfx/gl/gl_surface.h"	22 #include "ui/gl/gl_surface.h"

23 #include "webkit/glue/webkit_glue.h"	23 #include "webkit/glue/webkit_glue.h"

24 #include "webkit/plugins/npapi/plugin_instance.h"	24 #include "webkit/plugins/npapi/plugin_instance.h"

25 #include "webkit/plugins/npapi/plugin_lib.h"	25 #include "webkit/plugins/npapi/plugin_lib.h"

26 #include "webkit/plugins/npapi/plugin_list.h"	26 #include "webkit/plugins/npapi/plugin_list.h"

27 #include "webkit/plugins/npapi/plugin_stream_url.h"	27 #include "webkit/plugins/npapi/plugin_stream_url.h"

28 #include "webkit/plugins/npapi/webplugin_delegate.h"	28 #include "webkit/plugins/npapi/webplugin_delegate.h"

29 #include "webkit/plugins/webplugininfo.h"	29 #include "webkit/plugins/webplugininfo.h"

30	30

31 #if defined(OS_MACOSX)	31 #if defined(OS_MACOSX)

32 #include "base/mac/mac_util.h"	32 #include "base/mac/mac_util.h"

(...skipping 1119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1152 }	1152 }

1153	1153

1154 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {	1154 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {

1155 scoped_refptr<PluginInstance> plugin(FindInstance(instance));	1155 scoped_refptr<PluginInstance> plugin(FindInstance(instance));

1156 if (plugin.get()) {	1156 if (plugin.get()) {

1157 plugin->URLRedirectResponse(!!allow, notify_data);	1157 plugin->URLRedirectResponse(!!allow, notify_data);

1158 }	1158 }

1159 }	1159 }

1160	1160

1161 } // extern "C"	1161 } // extern "C"

OLD	NEW