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

Side by Side Diff: content/common/npobject_stub.cc

Issue 8277018: Move content_switches to content\public\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/common/handle_enumerator_win.cc ('k') | content/common/pepper_plugin_registry.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) 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/common/npobject_stub.h" 5 #include "content/common/npobject_stub.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/common/content_client.h" 8 #include "content/common/content_client.h"
9 #include "content/common/content_switches.h"
10 #include "content/common/np_channel_base.h" 9 #include "content/common/np_channel_base.h"
11 #include "content/common/npobject_util.h" 10 #include "content/common/npobject_util.h"
12 #include "content/common/plugin_messages.h" 11 #include "content/common/plugin_messages.h"
12 #include "content/public/common/content_switches.h"
13 #include "third_party/npapi/bindings/npapi.h" 13 #include "third_party/npapi/bindings/npapi.h"
14 #include "third_party/npapi/bindings/npruntime.h" 14 #include "third_party/npapi/bindings/npruntime.h"
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
16 #include "webkit/plugins/npapi/plugin_constants_win.h" 16 #include "webkit/plugins/npapi/plugin_constants_win.h"
17 17
18 using WebKit::WebBindings; 18 using WebKit::WebBindings;
19 19
20 NPObjectStub::NPObjectStub( 20 NPObjectStub::NPObjectStub(
21 NPObject* npobject, 21 NPObject* npobject,
22 NPChannelBase* channel, 22 NPChannelBase* channel,
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 388
389 bool return_value = WebBindings::evaluateHelper(0, popups_allowed, npobject_, 389 bool return_value = WebBindings::evaluateHelper(0, popups_allowed, npobject_,
390 &script_string, &result_var); 390 &script_string, &result_var);
391 391
392 NPVariant_Param result_param; 392 NPVariant_Param result_param;
393 CreateNPVariantParam( 393 CreateNPVariantParam(
394 result_var, channel_, &result_param, true, containing_window_, page_url_); 394 result_var, channel_, &result_param, true, containing_window_, page_url_);
395 NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value); 395 NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value);
396 channel_->Send(reply_msg); 396 channel_->Send(reply_msg);
397 } 397 }
OLDNEW
« no previous file with comments | « content/common/handle_enumerator_win.cc ('k') | content/common/pepper_plugin_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698