Clean up plug-in placeholders:

webkit/plugins/webview_plugin.h

 // Copyright (c) 2011 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 WEBKIT_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_

[jam, 2011/11/22 18:03:32]

nit: update ifdef guards

[Bernhard Bauer, 2011/11/22 18:53:33]

Done.

 #define WEBKIT_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_
 
 #include <list>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
 
 namespace WebKit {
 class WebMouseEvent;
 }
 struct WebPreferences;
 
 namespace webkit {
-namespace npapi {
 
 // This class implements the WebPlugin interface by forwarding drawing and
 // handling input events to a WebView.
 // It can be used as a placeholder for an actual plugin, using HTML for the UI.
 // To show HTML data inside the WebViewPlugin,
 // call web_view->mainFrame()->loadHTMLString() with the HTML data and a fake
 // chrome:// URL as origin.
 
 class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient,
                      public WebKit::WebFrameClient {
  public:
   class Delegate {
    public:
     // Bind |frame| to a Javascript object, enabling the delegate to receive
     // callback methods from Javascript inside the WebFrame.
     // This method is called from WebFrameClient::didClearWindowObject.
     virtual void BindWebFrame(WebKit::WebFrame* frame) = 0;
 
     // Called before the WebViewPlugin is destroyed. The delegate should delete
     // itself here.
     virtual void WillDestroyPlugin() = 0;
 
     // Called upon a context menu event.
-    virtual void ShowContextMenu(const WebKit::WebMouseEvent&) = 0;
+    virtual void ShowContextMenu(const WebKit::WebMouseEvent&) {}

[jam, 2011/11/22 18:03:32]

nit: it's much better to have interfaces that are all pure. why did you need to
change this?

[Bernhard Bauer, 2011/11/22 18:53:33]

Hm, I guess that's from an earlier version where I didn't have the shared base
class. 

Out of curiosity, why is it much better to have pure interfaces? I like the
convenience of having empty implementations :)

   };
 
   explicit WebViewPlugin(Delegate* delegate);
 
   // Convenience method to set up a new WebViewPlugin using |preferences|
   // and displaying |html_data|. |url| should be a (fake) chrome:// URL; it is
   // only used for navigation and never actually resolved.
   static WebViewPlugin* Create(Delegate* delegate,
                                const WebPreferences& preferences,
                                const std::string& html_data,
@@ skipping 73 matching lines @@
   // (which does nothing) to correctly overload it.
   virtual void didReceiveResponse(WebKit::WebFrame* frame,
                                   unsigned identifier,
                                   const WebKit::WebURLResponse& response);
 
  private:
   friend class DeleteTask<WebViewPlugin>;
   virtual ~WebViewPlugin();
 
   Delegate* delegate_;
+  // Destroys itself.
   WebKit::WebCursorInfo current_cursor_;
+  // Owns us.
   WebKit::WebPluginContainer* container_;
+  // Owned by us, deleted via |close()|.
   WebKit::WebView* web_view_;
   gfx::Rect rect_;
 
   WebKit::WebURLResponse response_;
   std::list<std::string> data_;
   bool finished_loading_;
   scoped_ptr<WebKit::WebURLError> error_;
   WebKit::WebString old_title_;
 };
 
-}  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_