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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 423613003: Move strings from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/child/blink_platform_impl.h" 5 #include "content/child/blink_platform_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 19 matching lines...) Expand all
30 #include "content/child/content_child_helpers.h" 30 #include "content/child/content_child_helpers.h"
31 #include "content/child/fling_curve_configuration.h" 31 #include "content/child/fling_curve_configuration.h"
32 #include "content/child/web_discardable_memory_impl.h" 32 #include "content/child/web_discardable_memory_impl.h"
33 #include "content/child/web_socket_stream_handle_impl.h" 33 #include "content/child/web_socket_stream_handle_impl.h"
34 #include "content/child/web_url_loader_impl.h" 34 #include "content/child/web_url_loader_impl.h"
35 #include "content/child/websocket_bridge.h" 35 #include "content/child/websocket_bridge.h"
36 #include "content/child/webthread_impl.h" 36 #include "content/child/webthread_impl.h"
37 #include "content/child/worker_task_runner.h" 37 #include "content/child/worker_task_runner.h"
38 #include "content/public/common/content_client.h" 38 #include "content/public/common/content_client.h"
39 #include "grit/blink_resources.h" 39 #include "grit/blink_resources.h"
40 #include "grit/content_strings.h"
40 #include "grit/webkit_resources.h" 41 #include "grit/webkit_resources.h"
41 #include "grit/webkit_strings.h"
42 #include "net/base/data_url.h" 42 #include "net/base/data_url.h"
43 #include "net/base/mime_util.h" 43 #include "net/base/mime_util.h"
44 #include "net/base/net_errors.h" 44 #include "net/base/net_errors.h"
45 #include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h" 45 #include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h"
46 #include "third_party/WebKit/public/platform/WebData.h" 46 #include "third_party/WebKit/public/platform/WebData.h"
47 #include "third_party/WebKit/public/platform/WebString.h" 47 #include "third_party/WebKit/public/platform/WebString.h"
48 #include "third_party/WebKit/public/platform/WebWaitableEvent.h" 48 #include "third_party/WebKit/public/platform/WebWaitableEvent.h"
49 #include "ui/base/layout.h" 49 #include "ui/base/layout.h"
50 50
51 #if defined(OS_ANDROID) 51 #if defined(OS_ANDROID)
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 } 1158 }
1159 1159
1160 // static 1160 // static
1161 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { 1161 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) {
1162 WebThreadImplForMessageLoop* impl = 1162 WebThreadImplForMessageLoop* impl =
1163 static_cast<WebThreadImplForMessageLoop*>(thread); 1163 static_cast<WebThreadImplForMessageLoop*>(thread);
1164 delete impl; 1164 delete impl;
1165 } 1165 }
1166 1166
1167 } // namespace content 1167 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698