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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 8461011: Clean up plug-in placeholders: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 years, 1 month 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/plugins/plugin_uma_unittest.cc ('k') | webkit/glue/webkit_glue.gypi » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 #include "webkit/glue/form_data.h" 139 #include "webkit/glue/form_data.h"
140 #include "webkit/glue/form_field.h" 140 #include "webkit/glue/form_field.h"
141 #include "webkit/glue/glue_serialize.h" 141 #include "webkit/glue/glue_serialize.h"
142 #include "webkit/glue/password_form_dom_manager.h" 142 #include "webkit/glue/password_form_dom_manager.h"
143 #include "webkit/glue/webdropdata.h" 143 #include "webkit/glue/webdropdata.h"
144 #include "webkit/glue/webkit_constants.h" 144 #include "webkit/glue/webkit_constants.h"
145 #include "webkit/glue/webkit_glue.h" 145 #include "webkit/glue/webkit_glue.h"
146 #include "webkit/glue/weburlloader_impl.h" 146 #include "webkit/glue/weburlloader_impl.h"
147 #include "webkit/media/video_renderer_impl.h" 147 #include "webkit/media/video_renderer_impl.h"
148 #include "webkit/media/webmediaplayer_impl.h" 148 #include "webkit/media/webmediaplayer_impl.h"
149 #include "webkit/plugins/npapi/default_plugin_shared.h"
150 #include "webkit/plugins/npapi/plugin_list.h" 149 #include "webkit/plugins/npapi/plugin_list.h"
151 #include "webkit/plugins/npapi/webplugin_delegate.h" 150 #include "webkit/plugins/npapi/webplugin_delegate.h"
152 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 151 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
153 #include "webkit/plugins/npapi/webplugin_impl.h" 152 #include "webkit/plugins/npapi/webplugin_impl.h"
154 #include "webkit/plugins/npapi/webview_plugin.h"
155 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" 153 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
156 154
157 #if defined(OS_WIN) 155 #if defined(OS_WIN)
158 // TODO(port): these files are currently Windows only because they concern: 156 // TODO(port): these files are currently Windows only because they concern:
159 // * theming 157 // * theming
160 #include "ui/gfx/native_theme_win.h" 158 #include "ui/gfx/native_theme_win.h"
161 #elif defined(USE_X11) 159 #elif defined(USE_X11)
162 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebRenderTheme. h" 160 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebRenderTheme. h"
163 #include "ui/gfx/native_theme.h" 161 #include "ui/gfx/native_theme.h"
164 #elif defined(OS_MACOSX) 162 #elif defined(OS_MACOSX)
(...skipping 4564 matching lines...) Expand 10 before | Expand all | Expand 10 after
4729 return !!RenderThreadImpl::current()->compositor_thread(); 4727 return !!RenderThreadImpl::current()->compositor_thread();
4730 } 4728 }
4731 4729
4732 void RenderViewImpl::OnJavaBridgeInit( 4730 void RenderViewImpl::OnJavaBridgeInit(
4733 const IPC::ChannelHandle& channel_handle) { 4731 const IPC::ChannelHandle& channel_handle) {
4734 DCHECK(!java_bridge_dispatcher_.get()); 4732 DCHECK(!java_bridge_dispatcher_.get());
4735 #if defined(ENABLE_JAVA_BRIDGE) 4733 #if defined(ENABLE_JAVA_BRIDGE)
4736 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4734 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
4737 #endif 4735 #endif
4738 } 4736 }
OLDNEW
« no previous file with comments | « chrome/renderer/plugins/plugin_uma_unittest.cc ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698