From 8cedf7f93d326825387281a9b02e4b0adcb78307 Mon Sep 17 00:00:00 2001 From: "mmoss@chromium.org" <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Thu, 9 Aug 2012 20:00:20 +0000 Subject: Revert 150863 - Browser Plugin: New Implementation (Renderer Side) BUG=140306 Tested: Added new browser tests! Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=150654 Review URL: https://chromiumcodereview.appspot.com/10830072 TBR=fsamuel@chromium.org Review URL: https://chromiumcodereview.appspot.com/10827257 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150873 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser_plugin/browser_plugin_bindings.h | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 content/renderer/browser_plugin/browser_plugin_bindings.h (limited to 'content/renderer/browser_plugin/browser_plugin_bindings.h') diff --git a/content/renderer/browser_plugin/browser_plugin_bindings.h b/content/renderer/browser_plugin/browser_plugin_bindings.h deleted file mode 100644 index 2d9fa2d..0000000 --- a/content/renderer/browser_plugin/browser_plugin_bindings.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_BINDINGS_H__ -#define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_BINDINGS_H__ - -#include "base/memory/weak_ptr.h" -#include "ppapi/shared_impl/resource.h" -#include "third_party/npapi/bindings/npruntime.h" - -namespace WebKit { -class WebSerializedScriptValue; -} - -namespace content { - -class BrowserPlugin; - -class BrowserPluginBindings { - public: - // BrowserPluginNPObject is a simple struct that adds a pointer back to a - // BrowserPluginBindings instance. This way, we can use an NPObject to allow - // JavaScript interactions without forcing BrowserPluginBindings to inherit - // from NPObject. - struct BrowserPluginNPObject : public NPObject { - BrowserPluginNPObject(); - ~BrowserPluginNPObject(); - - base::WeakPtr<BrowserPluginBindings> message_channel; - }; - - explicit BrowserPluginBindings(BrowserPlugin* instance); - ~BrowserPluginBindings(); - - NPObject* np_object() const { return np_object_; } - - BrowserPlugin* instance() const { return instance_; } - private: - BrowserPlugin* instance_; - // The NPObject we use to expose postMessage to JavaScript. - BrowserPluginNPObject* np_object_; - - // This is used to ensure pending tasks will not fire after this object is - // destroyed. - base::WeakPtrFactory<BrowserPluginBindings> weak_ptr_factory_; - - DISALLOW_COPY_AND_ASSIGN(BrowserPluginBindings); -}; - -} // namespace content - -#endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_BINDINGS_H__ -- cgit v1.1