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

Side by Side Diff: content/plugin/plugin_channel.h

Issue 7870008: Wait properly for renderer crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes 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
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 #ifndef CONTENT_PLUGIN_PLUGIN_CHANNEL_H_ 5 #ifndef CONTENT_PLUGIN_PLUGIN_CHANNEL_H_
6 #define CONTENT_PLUGIN_PLUGIN_CHANNEL_H_ 6 #define CONTENT_PLUGIN_PLUGIN_CHANNEL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 // Returns the event that's set when a call to the renderer causes a modal 44 // Returns the event that's set when a call to the renderer causes a modal
45 // dialog to come up. 45 // dialog to come up.
46 base::WaitableEvent* GetModalDialogEvent(gfx::NativeViewId containing_window); 46 base::WaitableEvent* GetModalDialogEvent(gfx::NativeViewId containing_window);
47 47
48 bool in_send() { return in_send_ != 0; } 48 bool in_send() { return in_send_ != 0; }
49 49
50 bool incognito() { return incognito_; } 50 bool incognito() { return incognito_; }
51 void set_incognito(bool value) { incognito_ = value; } 51 void set_incognito(bool value) { incognito_ = value; }
52 52
53 #if defined(OS_POSIX) 53 #if defined(OS_POSIX)
54 int renderer_fd() const { return channel_->GetClientFileDescriptor(); } 54 int TakeRendererFileDescriptor() {
55 return channel_->TakeClientFileDescriptor();
56 }
55 #endif 57 #endif
56 58
57 protected: 59 protected:
58 // IPC::Channel::Listener implementation: 60 // IPC::Channel::Listener implementation:
59 virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; 61 virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
60 virtual void OnChannelError() OVERRIDE; 62 virtual void OnChannelError() OVERRIDE;
61 63
62 virtual void CleanUp(); 64 virtual void CleanUp();
63 65
64 // Overrides PluginChannelBase::Init. 66 // Overrides PluginChannelBase::Init.
(...skipping 27 matching lines...) Expand all
92 94
93 int in_send_; // Tracks if we're in a Send call. 95 int in_send_; // Tracks if we're in a Send call.
94 bool log_messages_; // True if we should log sent and received messages. 96 bool log_messages_; // True if we should log sent and received messages.
95 bool incognito_; // True if the renderer is in incognito mode. 97 bool incognito_; // True if the renderer is in incognito mode.
96 scoped_refptr<MessageFilter> filter_; // Handles the modal dialog events. 98 scoped_refptr<MessageFilter> filter_; // Handles the modal dialog events.
97 99
98 DISALLOW_COPY_AND_ASSIGN(PluginChannel); 100 DISALLOW_COPY_AND_ASSIGN(PluginChannel);
99 }; 101 };
100 102
101 #endif // CONTENT_PLUGIN_PLUGIN_CHANNEL_H_ 103 #endif // CONTENT_PLUGIN_PLUGIN_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698