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

Side by Side Diff: chrome/plugin/npobject_stub.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 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
« no previous file with comments | « chrome/plugin/npobject_proxy.cc ('k') | chrome/plugin/npobject_util.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/plugin/npobject_stub.h" 5 #include "chrome/plugin/npobject_stub.h"
6 6
7 #include "chrome/common/child_process_logging.h" 7 #include "chrome/common/child_process_logging.h"
8 #include "chrome/common/plugin_messages.h" 8 #include "chrome/common/plugin_messages.h"
9 #include "chrome/plugin/npobject_util.h" 9 #include "chrome/plugin/npobject_util.h"
10 #include "chrome/plugin/plugin_channel_base.h" 10 #include "chrome/plugin/plugin_channel_base.h"
11 #include "chrome/plugin/plugin_thread.h" 11 #include "chrome/plugin/plugin_thread.h"
12 #include "third_party/npapi/bindings/npapi.h" 12 #include "third_party/npapi/bindings/npapi.h"
13 #include "third_party/npapi/bindings/npruntime.h" 13 #include "third_party/npapi/bindings/npruntime.h"
14 #include "webkit/api/public/WebBindings.h" 14 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
15 #include "webkit/glue/plugins/plugin_constants_win.h" 15 #include "webkit/glue/plugins/plugin_constants_win.h"
16 16
17 using WebKit::WebBindings; 17 using WebKit::WebBindings;
18 18
19 NPObjectStub::NPObjectStub( 19 NPObjectStub::NPObjectStub(
20 NPObject* npobject, 20 NPObject* npobject,
21 PluginChannelBase* channel, 21 PluginChannelBase* channel,
22 int route_id, 22 int route_id,
23 gfx::NativeViewId containing_window, 23 gfx::NativeViewId containing_window,
24 const GURL& page_url) 24 const GURL& page_url)
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 } 374 }
375 375
376 void NPObjectStub::OnSetException(const std::string& message) { 376 void NPObjectStub::OnSetException(const std::string& message) {
377 if (IsPluginProcess()) { 377 if (IsPluginProcess()) {
378 NOTREACHED() << "Should only be called on NPObjects in the renderer"; 378 NOTREACHED() << "Should only be called on NPObjects in the renderer";
379 return; 379 return;
380 } 380 }
381 381
382 WebBindings::setException(npobject_, message.c_str()); 382 WebBindings::setException(npobject_, message.c_str());
383 } 383 }
OLDNEW
« no previous file with comments | « chrome/plugin/npobject_proxy.cc ('k') | chrome/plugin/npobject_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698