| Index: webkit/glue/webkitclient_impl.h
|
| ===================================================================
|
| --- webkit/glue/webkitclient_impl.h (revision 10468)
|
| +++ webkit/glue/webkitclient_impl.h (working copy)
|
| @@ -16,9 +16,10 @@
|
| public:
|
| // WebKitClient methods:
|
| virtual WebKit::WebClipboard* clipboard();
|
| + virtual WebKit::WebMimeRegistry* mimeRegistry() = 0;
|
|
|
| private:
|
| - scoped_ptr<WebClipboardImpl> clipboard_;
|
| + WebClipboardImpl clipboard_;
|
| };
|
|
|
| } // namespace webkit_glue
|
|
|
| Property changes on: webkit\glue\webkitclient_impl.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webkit_client_impl.h:r3734-4217,4606-5108,5177-5263
|
|
|
|
|