summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 18:12:10 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 18:12:10 +0000
commitd5e4445f22f8257b5f94d5558af7c45aa523628e (patch)
treeb2be07698c1d2655dd32ea3c55566f565fb04441 /chrome/plugin
parentc7f243cedf49ea5e26cb2582719e114ff740bf96 (diff)
downloadchromium_src-d5e4445f22f8257b5f94d5558af7c45aa523628e.zip
chromium_src-d5e4445f22f8257b5f94d5558af7c45aa523628e.tar.gz
chromium_src-d5e4445f22f8257b5f94d5558af7c45aa523628e.tar.bz2
Remove references to off the record from PluginChannel. Contributed by vipul.bhasin@gmail.com, original change at http://codereview.chromium.org/6651017/
BUG=3333 Review URL: http://codereview.chromium.org/6657026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/plugin_channel.cc2
-rw-r--r--chrome/plugin/plugin_channel.h6
-rw-r--r--chrome/plugin/plugin_thread.cc4
-rw-r--r--chrome/plugin/plugin_thread.h2
-rw-r--r--chrome/plugin/webplugin_proxy.cc2
5 files changed, 8 insertions, 8 deletions
diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc
index 565060b..68d868f 100644
--- a/chrome/plugin/plugin_channel.cc
+++ b/chrome/plugin/plugin_channel.cc
@@ -165,7 +165,7 @@ PluginChannel::PluginChannel()
: renderer_handle_(0),
renderer_id_(-1),
in_send_(0),
- off_the_record_(false),
+ incognito_(false),
filter_(new MessageFilter()) {
set_send_unblocking_only_during_unblock_dispatch();
ChildProcess::current()->AddRefProcess();
diff --git a/chrome/plugin/plugin_channel.h b/chrome/plugin/plugin_channel.h
index 8e477af..b2a3add 100644
--- a/chrome/plugin/plugin_channel.h
+++ b/chrome/plugin/plugin_channel.h
@@ -46,8 +46,8 @@ class PluginChannel : public PluginChannelBase {
bool in_send() { return in_send_ != 0; }
- bool off_the_record() { return off_the_record_; }
- void set_off_the_record(bool value) { off_the_record_ = value; }
+ bool incognito() { return incognito_; }
+ void set_incognito(bool value) { incognito_ = value; }
#if defined(OS_POSIX)
int renderer_fd() const { return channel_->GetClientFileDescriptor(); }
@@ -90,7 +90,7 @@ class PluginChannel : public PluginChannelBase {
int in_send_; // Tracks if we're in a Send call.
bool log_messages_; // True if we should log sent and received messages.
- bool off_the_record_; // True if the renderer is in incognito mode.
+ bool incognito_; // True if the renderer is in incognito mode.
scoped_refptr<MessageFilter> filter_; // Handles the modal dialog events.
DISALLOW_COPY_AND_ASSIGN(PluginChannel);
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index ad0f521..cbbb2fb 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -141,7 +141,7 @@ bool PluginThread::OnControlMessageReceived(const IPC::Message& msg) {
}
void PluginThread::OnCreateChannel(int renderer_id,
- bool off_the_record) {
+ bool incognito) {
scoped_refptr<PluginChannel> channel(PluginChannel::GetPluginChannel(
renderer_id, ChildProcess::current()->io_message_loop()));
IPC::ChannelHandle channel_handle;
@@ -151,7 +151,7 @@ void PluginThread::OnCreateChannel(int renderer_id,
// On POSIX, pass the renderer-side FD.
channel_handle.socket = base::FileDescriptor(channel->renderer_fd(), false);
#endif
- channel->set_off_the_record(off_the_record);
+ channel->set_incognito(incognito);
}
Send(new PluginProcessHostMsg_ChannelCreated(channel_handle));
diff --git a/chrome/plugin/plugin_thread.h b/chrome/plugin/plugin_thread.h
index 8514589..9e6baa8 100644
--- a/chrome/plugin/plugin_thread.h
+++ b/chrome/plugin/plugin_thread.h
@@ -34,7 +34,7 @@ class PluginThread : public ChildThread {
virtual bool OnControlMessageReceived(const IPC::Message& msg);
// Callback for when a channel has been created.
- void OnCreateChannel(int renderer_id, bool off_the_record);
+ void OnCreateChannel(int renderer_id, bool incognito);
void OnPluginMessage(const std::vector<uint8> &data);
void OnNotifyRenderersOfPendingShutdown();
#if defined(OS_MACOSX)
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index d471f80..c0919d3 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -717,7 +717,7 @@ void WebPluginProxy::OnPaint(const gfx::Rect& damaged_rect) {
}
bool WebPluginProxy::IsOffTheRecord() {
- return channel_->off_the_record();
+ return channel_->incognito();
}
void WebPluginProxy::ResourceClientDeleted(