| Index: components/plugins/renderer/plugin_placeholder.h
|
| diff --git a/components/plugins/renderer/plugin_placeholder.h b/components/plugins/renderer/plugin_placeholder.h
|
| index 9f4f141ef407044a3c389aa77d8b7528238f1ea5..86ca35287c72412d76c1b14ded9af58dd32e4f68 100644
|
| --- a/components/plugins/renderer/plugin_placeholder.h
|
| +++ b/components/plugins/renderer/plugin_placeholder.h
|
| @@ -20,19 +20,16 @@ namespace plugins {
|
| class PluginPlaceholderBase : public content::RenderFrameObserver,
|
| public WebViewPlugin::Delegate {
|
| public:
|
| - // |render_frame| and |frame| are weak pointers. If either one is going away,
|
| - // our |plugin_| will be destroyed as well and will notify us.
|
| + // |render_frame| is a weak pointer. If it is going away, our |plugin_| will
|
| + // be destroyed as well and will notify us.
|
| PluginPlaceholderBase(content::RenderFrame* render_frame,
|
| - blink::WebLocalFrame* frame,
|
| const blink::WebPluginParams& params,
|
| const std::string& html_data);
|
| -
|
| ~PluginPlaceholderBase() override;
|
|
|
| WebViewPlugin* plugin() { return plugin_; }
|
|
|
| protected:
|
| - blink::WebLocalFrame* GetFrame();
|
| const blink::WebPluginParams& GetPluginParams() const;
|
|
|
| // WebViewPlugin::Delegate methods:
|
| @@ -45,7 +42,7 @@ class PluginPlaceholderBase : public content::RenderFrameObserver,
|
| protected:
|
| // Hide this placeholder.
|
| void HidePlugin();
|
| - bool hidden() { return hidden_; }
|
| + bool hidden() const { return hidden_; }
|
|
|
| // JavaScript callbacks:
|
| void HideCallback();
|
| @@ -54,7 +51,6 @@ class PluginPlaceholderBase : public content::RenderFrameObserver,
|
| // RenderFrameObserver methods:
|
| void OnDestruct() override;
|
|
|
| - blink::WebLocalFrame* frame_;
|
| blink::WebPluginParams plugin_params_;
|
| WebViewPlugin* plugin_;
|
|
|
| @@ -70,7 +66,6 @@ class PluginPlaceholder final : public PluginPlaceholderBase,
|
| static gin::WrapperInfo kWrapperInfo;
|
|
|
| PluginPlaceholder(content::RenderFrame* render_frame,
|
| - blink::WebLocalFrame* frame,
|
| const blink::WebPluginParams& params,
|
| const std::string& html_data);
|
| ~PluginPlaceholder() override;
|
|
|