summaryrefslogtreecommitdiffstats
path: root/remoting/client/plugin/pepper_view.cc
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 23:05:05 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 23:05:05 +0000
commit53a4597d56e4ca47d70a0f72901d005f0019aca3 (patch)
tree794a2e9af105a28cfacf7b9ae77d7852985bd87c /remoting/client/plugin/pepper_view.cc
parentfebe94524deeb320646d623cd91ed87e1db67a7b (diff)
downloadchromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.zip
chromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.tar.gz
chromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.tar.bz2
Rename (Host|Client)Message to Chromoting(Host|Client)Message.
Rename HostMessage and ClientMessage to Chromoting{Host|Client}Message to avoid conflicts with messages in X11. Actually, only ClientMessage needs to be changed due to conflict, but HostMessage is changed to keep the names consistent. BUG=none TEST=remoting unittests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57112 Review URL: http://codereview.chromium.org/3161034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/plugin/pepper_view.cc')
-rw-r--r--remoting/client/plugin/pepper_view.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc
index 86b70fc..ab631a8 100644
--- a/remoting/client/plugin/pepper_view.cc
+++ b/remoting/client/plugin/pepper_view.cc
@@ -139,7 +139,7 @@ void PepperView::SetHostScreenSize(int width, int height) {
frame_ = NULL;
}
-void PepperView::HandleBeginUpdateStream(HostMessage* msg) {
+void PepperView::HandleBeginUpdateStream(ChromotingHostMessage* msg) {
if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(
NewRunnableMethod(this, &PepperView::HandleBeginUpdateStream,
@@ -147,7 +147,7 @@ void PepperView::HandleBeginUpdateStream(HostMessage* msg) {
return;
}
- scoped_ptr<HostMessage> deleter(msg);
+ scoped_ptr<ChromotingHostMessage> deleter(msg);
// Make sure the |frame_| is initialized.
if (!frame_) {
@@ -159,7 +159,7 @@ void PepperView::HandleBeginUpdateStream(HostMessage* msg) {
}
}
-void PepperView::HandleUpdateStreamPacket(HostMessage* msg) {
+void PepperView::HandleUpdateStreamPacket(ChromotingHostMessage* msg) {
if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(
NewRunnableMethod(this, &PepperView::HandleUpdateStreamPacket,
@@ -177,7 +177,7 @@ void PepperView::HandleUpdateStreamPacket(HostMessage* msg) {
Decode(msg);
}
-void PepperView::HandleEndUpdateStream(HostMessage* msg) {
+void PepperView::HandleEndUpdateStream(ChromotingHostMessage* msg) {
if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(
NewRunnableMethod(this, &PepperView::HandleEndUpdateStream,
@@ -185,7 +185,7 @@ void PepperView::HandleEndUpdateStream(HostMessage* msg) {
return;
}
- scoped_ptr<HostMessage> deleter(msg);
+ scoped_ptr<ChromotingHostMessage> deleter(msg);
EndDecoding();
}