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

Side by Side Diff: webkit/tools/test_shell/mock_webclipboard_impl.cc

Issue 260003: Move the clipboard stuff out of base and into app/clipboard. I renamed... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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
« no previous file with comments | « webkit/glue/webkit_glue.h ('k') | webkit/tools/test_shell/simple_clipboard_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "webkit/tools/test_shell/mock_webclipboard_impl.h" 5 #include "webkit/tools/test_shell/mock_webclipboard_impl.h"
6 6
7 #include "base/clipboard.h" 7 #include "app/clipboard/clipboard.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "net/base/escape.h" 10 #include "net/base/escape.h"
11 #include "webkit/api/public/WebImage.h" 11 #include "webkit/api/public/WebImage.h"
12 #include "webkit/api/public/WebURL.h" 12 #include "webkit/api/public/WebURL.h"
13 #include "webkit/glue/webclipboard_impl.h" 13 #include "webkit/glue/webclipboard_impl.h"
14 #include "webkit/glue/webkit_glue.h" 14 #include "webkit/glue/webkit_glue.h"
15 15
16 using WebKit::WebString; 16 using WebKit::WebString;
17 using WebKit::WebURL; 17 using WebKit::WebURL;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 void MockWebClipboardImpl::writeImage(const WebKit::WebImage& image, 80 void MockWebClipboardImpl::writeImage(const WebKit::WebImage& image,
81 const WebKit::WebURL& url, const WebKit::WebString& title) { 81 const WebKit::WebURL& url, const WebKit::WebString& title) {
82 if (!image.isNull()) { 82 if (!image.isNull()) {
83 m_htmlText = WebString::fromUTF8( 83 m_htmlText = WebString::fromUTF8(
84 webkit_glue::WebClipboardImpl::URLToImageMarkup(url, title)); 84 webkit_glue::WebClipboardImpl::URLToImageMarkup(url, title));
85 m_plainText = m_htmlText; 85 m_plainText = m_htmlText;
86 m_writeSmartPaste = false; 86 m_writeSmartPaste = false;
87 } 87 }
88 } 88 }
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.h ('k') | webkit/tools/test_shell/simple_clipboard_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698