Clear the clipboard closing Incognito window

content/browser/renderer_host/clipboard_message_filter.h

Index: content/browser/renderer_host/clipboard_message_filter.h
diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h
index 73cfdd0fde3de4a9953d7fbaaf27a88ea55bbbaf..76f7d9a8a65989f857239e763531a21171ecb038 100644
--- a/content/browser/renderer_host/clipboard_message_filter.h
+++ b/content/browser/renderer_host/clipboard_message_filter.h
@@ -16,9 +16,11 @@ class GURL;
 
 namespace content {
 
+class BrowserContext;
+
 class ClipboardMessageFilter : public BrowserMessageFilter {
  public:
-  ClipboardMessageFilter();
+  ClipboardMessageFilter(BrowserContext* browser_context);
 
   virtual void OverrideThreadForMessage(
       const IPC::Message& message,
@@ -28,8 +30,8 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
  private:
   virtual ~ClipboardMessageFilter();
 
-  void OnWriteObjectsAsync(const ui::Clipboard::ObjectMap& objects);
-  void OnWriteObjectsSync(const ui::Clipboard::ObjectMap& objects,
+  void OnWriteObjectsAsync(ui::Clipboard::ObjectMap objects);

[Jói, 2013/02/01 11:31:20]

Are you sure you want to pass by value here?

[vasilii, 2013/02/01 17:25:08]

I need a modifiable |objects|. So I removed all explicit copies from
implementation. I think it worth to delegate this job to compiler.

+  void OnWriteObjectsSync(ui::Clipboard::ObjectMap objects,
                           base::SharedMemoryHandle bitmap_handle);

[dcheng, 2013/01/31 22:25:56]

Is this the right place to add the clipboard hook? This will catch copy/cut from
WebKit, but what about code in Chrome that calls the other Clipboard::Write*
methods directly? Do we have a plan to address those?

[vasilii, 2013/02/01 17:25:08]

You are right - this CL handles copy from WebKit only. Other places listed in
Issue 171974 are to be dealt with separately. I can't add the hook to the
clipboard, there is no way to get corresponding BrowserContext* .

 
   void OnGetSequenceNumber(const ui::Clipboard::Buffer buffer,
@@ -64,6 +66,10 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
   // thread.
   static ui::Clipboard* GetClipboard();
 
+  // BrowserContext from RenderProcessHost. When the clipboard is accessed,
+  // this class notifies ContentBrowserClient and passes |browser_context_|.
+  BrowserContext* const browser_context_;
+
   DISALLOW_COPY_AND_ASSIGN(ClipboardMessageFilter);
 };