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

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

Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better Created 7 years, 6 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/webclipboard_impl.cc ('k') | webkit/glue/webkitplatformsupport_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) 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/glue/webkit_glue.h" 5 #include "webkit/glue/webkit_glue.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <mlang.h> 8 #include <mlang.h>
9 #include <objidl.h> 9 #include <objidl.h>
10 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 10 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
11 #include <sys/utsname.h> 11 #include <sys/utsname.h>
12 #endif 12 #endif
13 13
14 #if defined(OS_LINUX) 14 #if defined(OS_LINUX)
15 #include <malloc.h> 15 #include <malloc.h>
16 #endif 16 #endif
17 17
18 #include <limits> 18 #include <limits>
19 19
20 #include "base/logging.h" 20 #include "base/logging.h"
21 #include "base/memory/scoped_ptr.h" 21 #include "base/memory/scoped_ptr.h"
22 #include "base/path_service.h" 22 #include "base/path_service.h"
23 #include "base/process_util.h" 23 #include "base/process_util.h"
24 #include "base/string_util.h" 24 #include "base/string_util.h"
25 #include "base/stringprintf.h" 25 #include "base/stringprintf.h"
26 #include "base/strings/string_piece.h" 26 #include "base/strings/string_piece.h"
27 #include "base/strings/string_tokenizer.h" 27 #include "base/strings/string_tokenizer.h"
28 #include "base/strings/utf_string_conversions.h"
28 #include "base/sys_info.h" 29 #include "base/sys_info.h"
29 #include "base/utf_string_conversions.h"
30 #include "net/base/escape.h" 30 #include "net/base/escape.h"
31 #include "net/url_request/url_request.h" 31 #include "net/url_request/url_request.h"
32 #include "skia/ext/platform_canvas.h" 32 #include "skia/ext/platform_canvas.h"
33 #if defined(OS_MACOSX) 33 #if defined(OS_MACOSX)
34 #include "skia/ext/skia_utils_mac.h" 34 #include "skia/ext/skia_utils_mac.h"
35 #endif 35 #endif
36 #include "third_party/WebKit/public/platform/WebData.h" 36 #include "third_party/WebKit/public/platform/WebData.h"
37 #include "third_party/WebKit/public/platform/WebFileInfo.h" 37 #include "third_party/WebKit/public/platform/WebFileInfo.h"
38 #include "third_party/WebKit/public/platform/WebImage.h" 38 #include "third_party/WebKit/public/platform/WebImage.h"
39 #include "third_party/WebKit/public/platform/WebRect.h" 39 #include "third_party/WebKit/public/platform/WebRect.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 base::GetCurrentProcessHandle())); 228 base::GetCurrentProcessHandle()));
229 return process_metrics->GetPagefileUsage() >> 10; 229 return process_metrics->GetPagefileUsage() >> 10;
230 } 230 }
231 #endif 231 #endif
232 232
233 double ZoomFactorToZoomLevel(double factor) { 233 double ZoomFactorToZoomLevel(double factor) {
234 return WebView::zoomFactorToZoomLevel(factor); 234 return WebView::zoomFactorToZoomLevel(factor);
235 } 235 }
236 236
237 } // namespace webkit_glue 237 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webclipboard_impl.cc ('k') | webkit/glue/webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698