summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 01:44:10 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 01:44:10 +0000
commit3714e47374c375193e9dc4cf0a140d40af5ed3ff (patch)
tree574c8ef00befef5790db4c1477273fbe117a90ab /chrome/common
parent306d4e55fda262cabbdb929efd7ab42186f312ff (diff)
downloadchromium_src-3714e47374c375193e9dc4cf0a140d40af5ed3ff.zip
chromium_src-3714e47374c375193e9dc4cf0a140d40af5ed3ff.tar.gz
chromium_src-3714e47374c375193e9dc4cf0a140d40af5ed3ff.tar.bz2
Remove the routing id parameter from the desktop notification IPCs sent by the renderer.
We can retrieve the routing id from the message. BUG=70690 TEST=no change in functionality. Review URL: http://codereview.chromium.org/6299022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/render_messages_internal.h6
-rw-r--r--chrome/common/render_messages_params.cc6
-rw-r--r--chrome/common/render_messages_params.h3
3 files changed, 3 insertions, 12 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 0cc2db5..250c77d 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -2180,11 +2180,9 @@ IPC_MESSAGE_CONTROL1(ViewHostMsg_DocumentDetached,
// a desktop notification.
IPC_MESSAGE_ROUTED1(ViewHostMsg_ShowDesktopNotification,
ViewHostMsg_ShowNotification_Params)
-IPC_MESSAGE_ROUTED2(ViewHostMsg_CancelDesktopNotification,
- int /* routing_id */,
+IPC_MESSAGE_ROUTED1(ViewHostMsg_CancelDesktopNotification,
int /* notification_id */)
-IPC_MESSAGE_ROUTED3(ViewHostMsg_RequestNotificationPermission,
- int /* routing_id */,
+IPC_MESSAGE_ROUTED2(ViewHostMsg_RequestNotificationPermission,
GURL /* origin */,
int /* callback_context */)
IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_CheckNotificationPermission,
diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
index 409776b..59a17bd 100644
--- a/chrome/common/render_messages_params.cc
+++ b/chrome/common/render_messages_params.cc
@@ -1311,7 +1311,6 @@ void ParamTraits<ViewHostMsg_ShowNotification_Params>::Write(
WriteParam(m, p.direction);
WriteParam(m, p.replace_id);
WriteParam(m, p.notification_id);
- WriteParam(m, p.routing_id);
}
bool ParamTraits<ViewHostMsg_ShowNotification_Params>::Read(
@@ -1327,8 +1326,7 @@ bool ParamTraits<ViewHostMsg_ShowNotification_Params>::Read(
ReadParam(m, iter, &p->body) &&
ReadParam(m, iter, &p->direction) &&
ReadParam(m, iter, &p->replace_id) &&
- ReadParam(m, iter, &p->notification_id) &&
- ReadParam(m, iter, &p->routing_id);
+ ReadParam(m, iter, &p->notification_id);
}
void ParamTraits<ViewHostMsg_ShowNotification_Params>::Log(
@@ -1352,8 +1350,6 @@ void ParamTraits<ViewHostMsg_ShowNotification_Params>::Log(
LogParam(p.replace_id, l);
l->append(",");
LogParam(p.notification_id, l);
- l->append(",");
- LogParam(p.routing_id, l);
l->append(")");
}
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index 88473c6c..ce4b18c 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -742,9 +742,6 @@ struct ViewHostMsg_ShowNotification_Params {
// Notification ID for sending events back for this notification.
int notification_id;
-
- // The routing id of the message.
- int routing_id;
};
// Creates a new view via a control message since the view doesn't yet exist.