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

Side by Side Diff: chrome/renderer/webplugin_delegate_proxy.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/user_script_slave.cc ('k') | chrome/service/service_utility_process_host.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 #include "chrome/renderer/webplugin_delegate_proxy.h" 5 #include "chrome/renderer/webplugin_delegate_proxy.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
11 #include <algorithm> 11 #include <algorithm>
12 12
13 #include "app/resource_bundle.h"
14 #include "base/basictypes.h" 13 #include "base/basictypes.h"
15 #include "base/command_line.h" 14 #include "base/command_line.h"
16 #include "base/file_util.h" 15 #include "base/file_util.h"
17 #include "base/logging.h" 16 #include "base/logging.h"
18 #include "base/ref_counted.h" 17 #include "base/ref_counted.h"
19 #include "base/string_split.h" 18 #include "base/string_split.h"
20 #include "base/string_util.h" 19 #include "base/string_util.h"
21 #include "base/sys_info.h" 20 #include "base/sys_info.h"
22 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
23 #include "chrome/common/child_process_logging.h" 22 #include "chrome/common/child_process_logging.h"
(...skipping 16 matching lines...) Expand all
40 #include "net/base/mime_util.h" 39 #include "net/base/mime_util.h"
41 #include "printing/native_metafile.h" 40 #include "printing/native_metafile.h"
42 #include "skia/ext/platform_canvas.h" 41 #include "skia/ext/platform_canvas.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
45 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h"
46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 45 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
48 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" 47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
49 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 48 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
49 #include "ui/base/resource/resource_bundle.h"
50 #include "webkit/plugins/npapi/webplugin.h" 50 #include "webkit/plugins/npapi/webplugin.h"
51 #include "webkit/glue/webkit_glue.h" 51 #include "webkit/glue/webkit_glue.h"
52 52
53 #if defined(OS_POSIX) 53 #if defined(OS_POSIX)
54 #include "ipc/ipc_channel_posix.h" 54 #include "ipc/ipc_channel_posix.h"
55 #endif 55 #endif
56 56
57 using WebKit::WebBindings; 57 using WebKit::WebBindings;
58 using WebKit::WebCursorInfo; 58 using WebKit::WebCursorInfo;
59 using WebKit::WebDragData; 59 using WebKit::WebDragData;
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 } 1559 }
1560 #endif 1560 #endif
1561 1561
1562 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow, 1562 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
1563 int resource_id) { 1563 int resource_id) {
1564 if (!plugin_) 1564 if (!plugin_)
1565 return; 1565 return;
1566 1566
1567 plugin_->URLRedirectResponse(allow, resource_id); 1567 plugin_->URLRedirectResponse(allow, resource_id);
1568 } 1568 }
OLDNEW
« no previous file with comments | « chrome/renderer/user_script_slave.cc ('k') | chrome/service/service_utility_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698