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

Side by Side Diff: webkit/glue/webkit_glue.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 years, 1 month 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
« no previous file with comments | « webkit/glue/webkit_glue.h ('k') | webkit/glue/webkitclient_impl.h » ('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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 "config.h" 5 #include "config.h"
6 #include "webkit/glue/webkit_glue.h" 6 #include "webkit/glue/webkit_glue.h"
7 7
8 #if defined(OS_WIN) 8 #if defined(OS_WIN)
9 #include <objidl.h> 9 #include <objidl.h>
10 #include <mlang.h> 10 #include <mlang.h>
(...skipping 20 matching lines...) Expand all
31 #undef LOG 31 #undef LOG
32 #include "base/file_version_info.h" 32 #include "base/file_version_info.h"
33 #include "base/singleton.h" 33 #include "base/singleton.h"
34 #include "base/string_piece.h" 34 #include "base/string_piece.h"
35 #include "base/string_util.h" 35 #include "base/string_util.h"
36 #include "base/sys_info.h" 36 #include "base/sys_info.h"
37 #include "base/sys_string_conversions.h" 37 #include "base/sys_string_conversions.h"
38 #include "net/base/escape.h" 38 #include "net/base/escape.h"
39 #include "skia/ext/platform_canvas.h" 39 #include "skia/ext/platform_canvas.h"
40 #include "third_party/skia/include/core/SkBitmap.h" 40 #include "third_party/skia/include/core/SkBitmap.h"
41 #include "webkit/api/public/WebHistoryItem.h" 41 #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"
42 #include "webkit/api/public/WebString.h" 42 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
43 #include "webkit/api/public/WebVector.h" 43 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "webkit/api/public/win/WebInputEventFactory.h" 45 #include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
46 #endif 46 #endif
47 #include "webkit/api/src/WebFrameImpl.h" 47 #include "third_party/WebKit/WebKit/chromium/src/WebFrameImpl.h"
48 #include "webkit/api/src/WebViewImpl.h" 48 #include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h"
49 #include "webkit/glue/glue_serialize.h" 49 #include "webkit/glue/glue_serialize.h"
50 #include "webkit/glue/glue_util.h" 50 #include "webkit/glue/glue_util.h"
51 51
52 #include "webkit_version.h" // Generated 52 #include "webkit_version.h" // Generated
53 53
54 using WebKit::WebCanvas; 54 using WebKit::WebCanvas;
55 using WebKit::WebFrame; 55 using WebKit::WebFrame;
56 using WebKit::WebFrameImpl; 56 using WebKit::WebFrameImpl;
57 using WebKit::WebHistoryItem; 57 using WebKit::WebHistoryItem;
58 using WebKit::WebString; 58 using WebKit::WebString;
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 518
519 bool IsMediaCacheEnabled() { 519 bool IsMediaCacheEnabled() {
520 return g_enable_media_cache; 520 return g_enable_media_cache;
521 } 521 }
522 522
523 void SetMediaCacheEnabled(bool enabled) { 523 void SetMediaCacheEnabled(bool enabled) {
524 g_enable_media_cache = enabled; 524 g_enable_media_cache = enabled;
525 } 525 }
526 526
527 } // namespace webkit_glue 527 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.h ('k') | webkit/glue/webkitclient_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698