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

Side by Side Diff: chrome/renderer/renderer_glue.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | « chrome/renderer/render_view.cc ('k') | chrome/renderer/user_script_slave.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // This file provides the embedder's side of random webkit glue functions. 5 // This file provides the embedder's side of random webkit glue functions.
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include <windows.h> 10 #include <windows.h>
11 #endif 11 #endif
12 12
13 #include <vector> 13 #include <vector>
14 14
15 #include "app/resource_bundle.h"
16 #include "base/command_line.h" 15 #include "base/command_line.h"
17 #include "base/ref_counted.h" 16 #include "base/ref_counted.h"
18 #include "base/string_util.h" 17 #include "base/string_util.h"
19 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
20 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/chrome_version_info.h" 20 #include "chrome/common/chrome_version_info.h"
22 #include "chrome/common/render_messages.h" 21 #include "chrome/common/render_messages.h"
23 #include "chrome/common/socket_stream_dispatcher.h" 22 #include "chrome/common/socket_stream_dispatcher.h"
24 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
25 #include "chrome/plugin/npobject_util.h" 24 #include "chrome/plugin/npobject_util.h"
26 #include "chrome/renderer/net/renderer_net_predictor.h" 25 #include "chrome/renderer/net/renderer_net_predictor.h"
27 #include "chrome/renderer/render_process.h" 26 #include "chrome/renderer/render_process.h"
28 #include "chrome/renderer/render_thread.h" 27 #include "chrome/renderer/render_thread.h"
29 #include "googleurl/src/url_util.h" 28 #include "googleurl/src/url_util.h"
30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h" 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
33 #include "third_party/skia/include/core/SkBitmap.h" 32 #include "third_party/skia/include/core/SkBitmap.h"
34 #include "ui/base/clipboard/clipboard.h" 33 #include "ui/base/clipboard/clipboard.h"
34 #include "ui/base/resource/resource_bundle.h"
35 #include "webkit/glue/scoped_clipboard_writer_glue.h" 35 #include "webkit/glue/scoped_clipboard_writer_glue.h"
36 #include "webkit/glue/webkit_glue.h" 36 #include "webkit/glue/webkit_glue.h"
37 #include "webkit/glue/websocketstreamhandle_bridge.h" 37 #include "webkit/glue/websocketstreamhandle_bridge.h"
38 38
39 #if !defined(DISABLE_NACL) 39 #if !defined(DISABLE_NACL)
40 #include "native_client/src/shared/imc/nacl_imc.h" 40 #include "native_client/src/shared/imc/nacl_imc.h"
41 #include "native_client/src/trusted/plugin/nacl_entry_points.h" 41 #include "native_client/src/trusted/plugin/nacl_entry_points.h"
42 #endif 42 #endif
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 } 313 }
314 314
315 bool GetFontTable(int fd, uint32_t table, uint8_t* output, 315 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
316 size_t* output_length) { 316 size_t* output_length) {
317 return renderer_sandbox_support::GetFontTable( 317 return renderer_sandbox_support::GetFontTable(
318 fd, table, output, output_length); 318 fd, table, output, output_length);
319 } 319 }
320 #endif 320 #endif
321 321
322 } // namespace webkit_glue 322 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | chrome/renderer/user_script_slave.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698