Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/webkitclient_impl.cc

Issue 27222: Chrome side to implement WebMimeRegistry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webkitclient_impl.h ('k') | webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj » ('j') | webkit/webkit.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkitclient_impl.cc
===================================================================
--- webkit/glue/webkitclient_impl.cc (revision 10468)
+++ webkit/glue/webkitclient_impl.cc (working copy)
@@ -6,14 +6,12 @@
// Mac build requires it.
#include "config.h"
-#include "webkit/glue/webkit_client_impl.h"
+#include "webkit/glue/webkitclient_impl.h"
namespace webkit_glue {
WebKit::WebClipboard* WebKitClientImpl::clipboard() {
- if (!clipboard_.get())
- clipboard_.reset(new WebClipboardImpl());
- return clipboard_.get();
+ return &clipboard_;
}
} // namespace webkit_glue
Property changes on: webkit\glue\webkitclient_impl.cc
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webkit_client_impl.cc:r3734-4217,4606-5108,5177-5263
« no previous file with comments | « webkit/glue/webkitclient_impl.h ('k') | webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj » ('j') | webkit/webkit.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698