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

Side by Side Diff: webkit/support/platform_support_mac.mm

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/support/mock_webclipboard_impl.cc ('k') | webkit/support/simple_database_system.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/support/platform_support.h" 5 #include "webkit/support/platform_support.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 #include <AvailabilityMacros.h> 8 #include <AvailabilityMacros.h>
9 #import <Foundation/Foundation.h> 9 #import <Foundation/Foundation.h>
10 #import <objc/objc-runtime.h> 10 #import <objc/objc-runtime.h>
11 11
12 #include "base/base_paths.h" 12 #include "base/base_paths.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/mac/bundle_locations.h" 15 #include "base/mac/bundle_locations.h"
16 #include "base/mac/mac_util.h" 16 #include "base/mac/mac_util.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/string16.h" 18 #include "base/string16.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
20 #include "grit/webkit_resources.h" 20 #include "grit/webkit_resources.h"
21 #include "ui/base/resource/data_pack.h" 21 #include "ui/base/resource/data_pack.h"
22 #include "webkit/plugins/npapi/plugin_list.h" 22 #include "webkit/plugins/npapi/plugin_list.h"
23 #import "webkit/support/drt_application_mac.h" 23 #import "webkit/support/drt_application_mac.h"
24 #import "webkit/support/mac/DumpRenderTreePasteboard.h" 24 #import "webkit/support/mac/DumpRenderTreePasteboard.h"
25 #include "webkit/support/test_webkit_platform_support.h" 25 #include "webkit/support/test_webkit_platform_support.h"
26 26
27 static ui::DataPack* g_resource_data_pack = NULL; 27 static ui::DataPack* g_resource_data_pack = NULL;
28 28
29 namespace webkit_support { 29 namespace webkit_support {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 246 }
247 } 247 }
248 return resize_corner_data; 248 return resize_corner_data;
249 } 249 }
250 } 250 }
251 base::StringPiece res; 251 base::StringPiece res;
252 if (g_resource_data_pack) 252 if (g_resource_data_pack)
253 g_resource_data_pack->GetStringPiece(resource_id, &res); 253 g_resource_data_pack->GetStringPiece(resource_id, &res);
254 return res; 254 return res;
255 } 255 }
OLDNEW
« no previous file with comments | « webkit/support/mock_webclipboard_impl.cc ('k') | webkit/support/simple_database_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698