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/java/java_bridge_dispatcher.cc

Issue 19462016: Move npapi related files from content\child to the new content\child\npapi directory. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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/renderer/java/java_bridge_channel.h ('k') | content/renderer/plugin_channel_host.h » ('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/java/java_bridge_dispatcher.h" 5 #include "content/renderer/java/java_bridge_dispatcher.h"
6 6
7 #include "content/child/child_process.h" 7 #include "content/child/child_process.h"
8 #include "content/child/npobject_util.h" // For CreateNPVariant() 8 #include "content/child/npapi/npobject_util.h" // For CreateNPVariant()
9 #include "content/common/java_bridge_messages.h" 9 #include "content/common/java_bridge_messages.h"
10 #include "content/public/renderer/render_thread.h" 10 #include "content/public/renderer/render_thread.h"
11 #include "content/public/renderer/render_view.h" 11 #include "content/public/renderer/render_view.h"
12 #include "content/renderer/java/java_bridge_channel.h" 12 #include "content/renderer/java/java_bridge_channel.h"
13 #include "third_party/WebKit/public/web/WebBindings.h" 13 #include "third_party/WebKit/public/web/WebBindings.h"
14 #include "third_party/WebKit/public/web/WebDocument.h" 14 #include "third_party/WebKit/public/web/WebDocument.h"
15 #include "third_party/WebKit/public/web/WebFrame.h" 15 #include "third_party/WebKit/public/web/WebFrame.h"
16 #include "third_party/WebKit/public/web/WebView.h" 16 #include "third_party/WebKit/public/web/WebView.h"
17 17
18 namespace content { 18 namespace content {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // Removing an object does not unbind it from JavaScript until the window 104 // Removing an object does not unbind it from JavaScript until the window
105 // object is next cleared. Note that the browser checks that the named object 105 // object is next cleared. Note that the browser checks that the named object
106 // is present. 106 // is present.
107 ObjectMap::iterator iter = objects_.find(name); 107 ObjectMap::iterator iter = objects_.find(name);
108 DCHECK(iter != objects_.end()); 108 DCHECK(iter != objects_.end());
109 WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second)); 109 WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
110 objects_.erase(iter); 110 objects_.erase(iter);
111 } 111 }
112 112
113 } // namespace content 113 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/java/java_bridge_channel.h ('k') | content/renderer/plugin_channel_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698