commit a527a028b91cfd7777f4122002890d44da7a923b
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Feb 10 02:32:36 2011
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Feb 10 02:32:36 2011
tree f307b9c139c9ae60b21dd6679e5f9834318f10e6
parent 74c89f1953ee4c94e50aaf7df6bbf30415c47ddb

Don't include render_message_params.h from headers.
Review URL: http://codereview.chromium.org/6479002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74401 0039d316-1c4b-4281-b951-d872f2087c98

chrome/renderer/render_view.cc

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 6b8761d3..6d66c53 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -41,6 +41,7 @@
 #include "chrome/common/pepper_messages.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/render_messages_params.h"
 #include "chrome/common/render_view_commands.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/thumbnail_score.h"
@@ -755,8 +756,8 @@
 
 bool RenderView::RendererAccessibilityNotification::ShouldIncludeChildren() {
   typedef ViewHostMsg_AccessibilityNotification_Params params;
-  if (type == params::NOTIFICATION_TYPE_CHILDREN_CHANGED ||
-      type == params::NOTIFICATION_TYPE_LOAD_COMPLETE) {
+  if (type == WebKit::WebAccessibilityNotificationChildrenChanged ||
+      type == WebKit::WebAccessibilityNotificationLoadComplete) {
     return true;
   }
   return false;
@@ -2285,7 +2286,8 @@
       continue;
 
     ViewHostMsg_AccessibilityNotification_Params param;
-    param.notification_type = pending_accessibility_notifications_[i].type;
+    WebAccessibilityNotificationToViewHostMsg(
+        pending_accessibility_notifications_[i].type, &param.notification_type);
     param.acc_obj = WebAccessibility(
         obj, accessibility_.get(), notification.ShouldIncludeChildren());
     notifications.push_back(param);
@@ -5342,14 +5344,13 @@
   // Add the accessibility object to our cache and ensure it's valid.
   RendererAccessibilityNotification acc_notification;
   acc_notification.id = accessibility_->addOrGetId(obj);
+  acc_notification.type = notification;
   if (acc_notification.id < 0)
     return;
 
-  if (!WebAccessibilityNotificationToViewHostMsg(
-          notification,
-          &acc_notification.type)) {
+  ViewHostMsg_AccessibilityNotification_Params::NotificationType temp;
+  if (!WebAccessibilityNotificationToViewHostMsg(notification, &temp))
     return;
-  }
 
   // Discard duplicate accessibility notifications.
   for (uint32 i = 0; i < pending_accessibility_notifications_.size(); i++) {