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

Side by Side Diff: webkit/glue/webkitclient_impl.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/webkitclient_impl.h ('k') | webkit/glue/webmediaplayer_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) 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 <math.h> 5 #include <math.h>
6 #include "config.h" 6 #include "config.h"
7 7
8 #include "FrameView.h" 8 #include "FrameView.h"
9 #include "ScrollView.h" 9 #include "ScrollView.h"
10 #include <wtf/Assertions.h> 10 #include <wtf/Assertions.h>
11 #undef LOG 11 #undef LOG
12 12
13 #include "webkit/glue/webkitclient_impl.h" 13 #include "webkit/glue/webkitclient_impl.h"
14 14
15 #include "base/file_path.h" 15 #include "base/file_path.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/message_loop.h" 17 #include "base/message_loop.h"
18 #include "base/process_util.h" 18 #include "base/process_util.h"
19 #include "base/platform_file.h" 19 #include "base/platform_file.h"
20 #include "base/stats_counters.h" 20 #include "base/stats_counters.h"
21 #include "base/string_util.h" 21 #include "base/string_util.h"
22 #include "base/trace_event.h" 22 #include "base/trace_event.h"
23 #include "grit/webkit_resources.h" 23 #include "grit/webkit_resources.h"
24 #include "grit/webkit_strings.h" 24 #include "grit/webkit_strings.h"
25 #include "net/base/net_util.h" 25 #include "net/base/net_util.h"
26 #include "webkit/api/public/WebCookie.h" 26 #include "third_party/WebKit/WebKit/chromium/public/WebCookie.h"
27 #include "webkit/api/public/WebData.h" 27 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
28 #include "webkit/api/public/WebFrameClient.h" 28 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h"
29 #include "webkit/api/public/WebPluginListBuilder.h" 29 #include "third_party/WebKit/WebKit/chromium/public/WebPluginListBuilder.h"
30 #include "webkit/api/public/WebScreenInfo.h" 30 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
31 #include "webkit/api/public/WebString.h" 31 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
32 #include "webkit/api/public/WebVector.h" 32 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
33 #include "webkit/api/public/WebURL.h" 33 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
34 #include "webkit/glue/glue_util.h" 34 #include "webkit/glue/glue_util.h"
35 #include "webkit/glue/plugins/plugin_instance.h" 35 #include "webkit/glue/plugins/plugin_instance.h"
36 #include "webkit/glue/webkit_glue.h" 36 #include "webkit/glue/webkit_glue.h"
37 #include "webkit/glue/webplugininfo.h" 37 #include "webkit/glue/webplugininfo.h"
38 #include "webkit/glue/websocketstreamhandle_impl.h" 38 #include "webkit/glue/websocketstreamhandle_impl.h"
39 #include "webkit/glue/weburlloader_impl.h" 39 #include "webkit/glue/weburlloader_impl.h"
40 40
41 using WebKit::WebApplicationCacheHost; 41 using WebKit::WebApplicationCacheHost;
42 using WebKit::WebApplicationCacheHostClient; 42 using WebKit::WebApplicationCacheHostClient;
43 using WebKit::WebCookie; 43 using WebKit::WebCookie;
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 return file_util::DirectoryExists(file_path); 389 return file_util::DirectoryExists(file_path);
390 } 390 }
391 391
392 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) { 392 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) {
393 FilePath file_path(webkit_glue::WebStringToFilePathString(path)); 393 FilePath file_path(webkit_glue::WebStringToFilePathString(path));
394 GURL file_url = net::FilePathToFileURL(file_path); 394 GURL file_url = net::FilePathToFileURL(file_path);
395 return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url)); 395 return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url));
396 } 396 }
397 397
398 } // namespace webkit_glue 398 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkitclient_impl.h ('k') | webkit/glue/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698