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

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

Issue 10905122: Initial NPAPI plugin support in Win Aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 8 years, 3 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 | « content/port/browser/render_widget_host_view_port.h ('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) 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 "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 4211 matching lines...) Expand 10 before | Expand all | Expand 10 after
4222 scoped_refptr<webkit::ppapi::PluginModule> pepper_module( 4222 scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
4223 pepper_delegate_.CreatePepperPluginModule(info, 4223 pepper_delegate_.CreatePepperPluginModule(info,
4224 &pepper_plugin_was_registered)); 4224 &pepper_plugin_was_registered));
4225 if (pepper_plugin_was_registered) { 4225 if (pepper_plugin_was_registered) {
4226 if (!pepper_module) 4226 if (!pepper_module)
4227 return NULL; 4227 return NULL;
4228 return new webkit::ppapi::WebPluginImpl( 4228 return new webkit::ppapi::WebPluginImpl(
4229 pepper_module.get(), params, pepper_delegate_.AsWeakPtr()); 4229 pepper_module.get(), params, pepper_delegate_.AsWeakPtr());
4230 } 4230 }
4231 4231
4232 #if defined(USE_AURA) 4232
4233 #if defined(USE_AURA) && !defined(OS_WIN)
4233 return NULL; 4234 return NULL;
4234 #else 4235 #else
4235 return new webkit::npapi::WebPluginImpl( 4236 return new webkit::npapi::WebPluginImpl(
4236 frame, params, info.path, AsWeakPtr()); 4237 frame, params, info.path, AsWeakPtr());
4237 #endif 4238 #endif
4238 } 4239 }
4239 4240
4240 void RenderViewImpl::EvaluateScript(const string16& frame_xpath, 4241 void RenderViewImpl::EvaluateScript(const string16& frame_xpath,
4241 const string16& jscript, 4242 const string16& jscript,
4242 int id, 4243 int id,
(...skipping 1914 matching lines...) Expand 10 before | Expand all | Expand 10 after
6157 6158
6158 updating_frame_tree_ = true; 6159 updating_frame_tree_ = true;
6159 active_frame_id_map_.clear(); 6160 active_frame_id_map_.clear();
6160 6161
6161 target_process_id_ = process_id; 6162 target_process_id_ = process_id;
6162 target_routing_id_ = route_id; 6163 target_routing_id_ = route_id;
6163 CreateFrameTree(webview()->mainFrame(), frames); 6164 CreateFrameTree(webview()->mainFrame(), frames);
6164 6165
6165 updating_frame_tree_ = false; 6166 updating_frame_tree_ = false;
6166 } 6167 }
OLDNEW
« no previous file with comments | « content/port/browser/render_widget_host_view_port.h ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698