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

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

Issue 7983032: Add NPChannelBase::GetModalDialogEvent() to avoid content/plugin/ include from npobject_proxy.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased after http://codereview.chromium.org/7982026 Created 9 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/common/np_channel_base.h ('k') | content/common/npobject_proxy.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/np_channel_base.h" 5 #include "content/common/np_channel_base.h"
6 6
7 #include <stack> 7 #include <stack>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/hash_tables.h" 10 #include "base/hash_tables.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 NPObjectBase* NPChannelBase::GetNPObjectListenerForRoute(int route_id) { 104 NPObjectBase* NPChannelBase::GetNPObjectListenerForRoute(int route_id) {
105 ListenerMap::iterator iter = npobject_listeners_.find(route_id); 105 ListenerMap::iterator iter = npobject_listeners_.find(route_id);
106 if (iter == npobject_listeners_.end()) { 106 if (iter == npobject_listeners_.end()) {
107 DLOG(WARNING) << "Invalid route id passed in:" << route_id; 107 DLOG(WARNING) << "Invalid route id passed in:" << route_id;
108 return NULL; 108 return NULL;
109 } 109 }
110 return iter->second; 110 return iter->second;
111 } 111 }
112 112
113 base::WaitableEvent* NPChannelBase::GetModalDialogEvent(
114 gfx::NativeViewId containing_window) {
115 return NULL;
116 }
117
113 bool NPChannelBase::Init(base::MessageLoopProxy* ipc_message_loop, 118 bool NPChannelBase::Init(base::MessageLoopProxy* ipc_message_loop,
114 bool create_pipe_now, 119 bool create_pipe_now,
115 base::WaitableEvent* shutdown_event) { 120 base::WaitableEvent* shutdown_event) {
116 channel_.reset(new IPC::SyncChannel( 121 channel_.reset(new IPC::SyncChannel(
117 channel_handle_, mode_, this, ipc_message_loop, create_pipe_now, 122 channel_handle_, mode_, this, ipc_message_loop, create_pipe_now,
118 shutdown_event)); 123 shutdown_event));
119 channel_valid_ = true; 124 channel_valid_ = true;
120 return true; 125 return true;
121 } 126 }
122 127
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 267
263 void NPChannelBase::RemoveMappingForNPObjectStub(int route_id, 268 void NPChannelBase::RemoveMappingForNPObjectStub(int route_id,
264 NPObject* object) { 269 NPObject* object) {
265 DCHECK(object != NULL); 270 DCHECK(object != NULL);
266 stub_map_.erase(object); 271 stub_map_.erase(object);
267 } 272 }
268 273
269 void NPChannelBase::RemoveMappingForNPObjectProxy(int route_id) { 274 void NPChannelBase::RemoveMappingForNPObjectProxy(int route_id) {
270 proxy_map_.erase(route_id); 275 proxy_map_.erase(route_id);
271 } 276 }
OLDNEW
« no previous file with comments | « content/common/np_channel_base.h ('k') | content/common/npobject_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698