OLD | NEW |
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_piece.h" | |
25 #include "base/string_util.h" | 24 #include "base/string_util.h" |
26 #include "base/stringprintf.h" | 25 #include "base/stringprintf.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/sys_info.h" | 28 #include "base/sys_info.h" |
29 #include "base/utf_string_conversions.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/Source/Platform/chromium/public/WebData.h" | 36 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 base::GetCurrentProcessHandle())); | 366 base::GetCurrentProcessHandle())); |
367 return process_metrics->GetPagefileUsage() >> 10; | 367 return process_metrics->GetPagefileUsage() >> 10; |
368 } | 368 } |
369 #endif | 369 #endif |
370 | 370 |
371 double ZoomFactorToZoomLevel(double factor) { | 371 double ZoomFactorToZoomLevel(double factor) { |
372 return WebView::zoomFactorToZoomLevel(factor); | 372 return WebView::zoomFactorToZoomLevel(factor); |
373 } | 373 } |
374 | 374 |
375 } // namespace webkit_glue | 375 } // namespace webkit_glue |
OLD | NEW |