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

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

Issue 11632002: Use generated shim headers for zlib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/tools/test_shell/simple_clipboard_impl.h" 5 #include "webkit/tools/test_shell/simple_clipboard_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "base/string16.h" 11 #include "base/string16.h"
12 #include "googleurl/src/gurl.h" 12 #include "googleurl/src/gurl.h"
13 #include "third_party/skia/include/core/SkBitmap.h" 13 #include "third_party/skia/include/core/SkBitmap.h"
14 #if defined(USE_SYSTEM_ZLIB)
15 #include <zlib.h>
16 #else
17 #include "third_party/zlib/zlib.h" 14 #include "third_party/zlib/zlib.h"
18 #endif
19 #include "ui/base/clipboard/clipboard.h" 15 #include "ui/base/clipboard/clipboard.h"
20 #include "ui/gfx/codec/png_codec.h" 16 #include "ui/gfx/codec/png_codec.h"
21 #include "ui/gfx/size.h" 17 #include "ui/gfx/size.h"
22 #include "webkit/glue/webkit_glue.h" 18 #include "webkit/glue/webkit_glue.h"
23 19
24 namespace { 20 namespace {
25 21
26 } // anonymous namespace 22 } // anonymous namespace
27 23
28 SimpleClipboardClient::SimpleClipboardClient() { 24 SimpleClipboardClient::SimpleClipboardClient() {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 109
114 void SimpleClipboardClient::ReadData(const ui::Clipboard::FormatType& format, 110 void SimpleClipboardClient::ReadData(const ui::Clipboard::FormatType& format,
115 std::string* data) { 111 std::string* data) {
116 GetClipboard()->ReadData(format, data); 112 GetClipboard()->ReadData(format, data);
117 } 113 }
118 114
119 webkit_glue::ClipboardClient::WriteContext* 115 webkit_glue::ClipboardClient::WriteContext*
120 SimpleClipboardClient::CreateWriteContext() { 116 SimpleClipboardClient::CreateWriteContext() {
121 return NULL; 117 return NULL;
122 } 118 }
OLDNEW
« build/shim_headers.gypi ('K') | « webkit/support/webkit_support_gfx.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698