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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webkit_client_impl.cc:r3734-4217,4606-5108,5177-5263
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 // TODO(darin): This include should not be necessary, but for some reason the 5 // TODO(darin): This include should not be necessary, but for some reason the
6 // Mac build requires it. 6 // Mac build requires it.
7 #include "config.h" 7 #include "config.h"
8 8
9 #include "webkit/glue/webkit_client_impl.h" 9 #include "webkit/glue/webkitclient_impl.h"
10 10
11 namespace webkit_glue { 11 namespace webkit_glue {
12 12
13 WebKit::WebClipboard* WebKitClientImpl::clipboard() { 13 WebKit::WebClipboard* WebKitClientImpl::clipboard() {
14 if (!clipboard_.get()) 14 return &clipboard_;
15 clipboard_.reset(new WebClipboardImpl());
16 return clipboard_.get();
17 } 15 }
18 16
19 } // namespace webkit_glue 17 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698