content/child/npapi/plugin_instance.cc - Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content.

Side by Side Diff: content/child/npapi/plugin_instance.cc

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 7 years, 5 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

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_instance.h"	5 #include "content/child/npapi/plugin_instance.h"

6	6

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

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

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

10 #include "base/strings/string_number_conversions.h"	10 #include "base/strings/string_number_conversions.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

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

	13 #include "content/child/npapi/plugin_host.h"

	14 #include "content/child/npapi/plugin_lib.h"

	15 #include "content/child/npapi/plugin_stream_url.h"

	16 #include "content/child/npapi/plugin_string_stream.h"

	17 #include "content/child/npapi/webplugin.h"

	18 #include "content/child/npapi/webplugin_delegate.h"

13 #include "net/base/escape.h"	19 #include "net/base/escape.h"

14 #include "webkit/plugins/npapi/plugin_host.h"

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

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

17 #include "webkit/plugins/npapi/plugin_string_stream.h"

18 #include "webkit/plugins/npapi/webplugin.h"

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

20 #include "webkit/plugins/plugin_constants.h"	20 #include "webkit/plugins/plugin_constants.h"

21	21

22 #if defined(OS_MACOSX)	22 #if defined(OS_MACOSX)

23 #include <ApplicationServices/ApplicationServices.h>	23 #include <ApplicationServices/ApplicationServices.h>

24 #endif	24 #endif

25	25

26 namespace webkit {	26 namespace content {

27 namespace npapi {

28	27

29 PluginInstance::PluginInstance(PluginLib* plugin, const std::string& mime_type)	28 PluginInstance::PluginInstance(PluginLib* plugin, const std::string& mime_type)

30 : plugin_(plugin),	29 : plugin_(plugin),

31 npp_(0),	30 npp_(0),

32 host_(PluginHost::Singleton()),	31 host_(PluginHost::Singleton()),

33 npp_functions_(plugin->functions()),	32 npp_functions_(plugin->functions()),

34 window_handle_(0),	33 window_handle_(0),

35 windowless_(false),	34 windowless_(false),

36 transparent_(true),	35 transparent_(true),

37 webplugin_(0),	36 webplugin_(0),

(...skipping 640 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
678 webplugin_->URLRedirectResponse(allow, resource_client->ResourceId());	677 webplugin_->URLRedirectResponse(allow, resource_client->ResourceId());

679 if (allow) {	678 if (allow) {

680 plugin_stream->UpdateUrl(	679 plugin_stream->UpdateUrl(

681 plugin_stream->pending_redirect_url().c_str());	680 plugin_stream->pending_redirect_url().c_str());

682 }	681 }

683 break;	682 break;

684 }	683 }

685 }	684 }

686 }	685 }

687	686

688 } // namespace npapi	687 } // namespace content

689 } // namespace webkit

OLD	NEW

« no previous file with comments | « content/child/npapi/plugin_instance.h ('k') | content/child/npapi/plugin_instance_mac.mm » ('j') | content/child/npapi/plugin_stream_url.h » ('J')