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

10 files changed, 33 insertions, 22 deletions

diff --git a/chrome/browser/accessibility/browser_accessibility_manager.cc b/chrome/browser/accessibility/browser_accessibility_manager.cc
index c1091e6..0f80e4f 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager.cc
+++ b/chrome/browser/accessibility/browser_accessibility_manager.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/accessibility/browser_accessibility.h"
+#include "chrome/common/render_messages_params.h"
 
 using webkit_glue::WebAccessibility;
 
diff --git a/chrome/browser/accessibility/browser_accessibility_manager.h b/chrome/browser/accessibility/browser_accessibility_manager.h
index 3c36e9f..f9ce989 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager.h
+++ b/chrome/browser/accessibility/browser_accessibility_manager.h
@@ -11,7 +11,6 @@
 #include "base/hash_tables.h"
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
-#include "chrome/common/render_messages_params.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/webaccessibility.h"
 
@@ -20,6 +19,8 @@ class BrowserAccessibility;
 class BrowserAccessibilityManagerWin;
 #endif
 
+struct ViewHostMsg_AccessibilityNotification_Params;
+
 using webkit_glue::WebAccessibility;
 
 // Class that can perform actions on behalf of the BrowserAccessibilityManager.
@@ -54,8 +55,11 @@ class BrowserAccessibilityManager {
 
   virtual ~BrowserAccessibilityManager();
 
+  // Type is a ViewHostMsg_AccessibilityNotification_Params::NotificationType.
+  // We pass it as int so that we don't include the render message declaration
+  // header here.
   virtual void NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::NotificationType n,
+      int type,
       BrowserAccessibility* node) = 0;
 
   // Returns the next unique child id.
diff --git a/chrome/browser/accessibility/browser_accessibility_manager_mac.h b/chrome/browser/accessibility/browser_accessibility_manager_mac.h
index 892de15..dc35d6f 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager_mac.h
+++ b/chrome/browser/accessibility/browser_accessibility_manager_mac.h
@@ -13,9 +13,7 @@
 class BrowserAccessibilityManagerMac : public BrowserAccessibilityManager {
  public:
   // Implementation of BrowserAccessibilityManager.
-  virtual void NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::NotificationType n,
-      BrowserAccessibility* node);
+  virtual void NotifyAccessibilityEvent(int type, BrowserAccessibility* node);
 
  private:
   // This gives BrowserAccessibilityManager::Create access to the class
diff --git a/chrome/browser/accessibility/browser_accessibility_manager_mac.mm b/chrome/browser/accessibility/browser_accessibility_manager_mac.mm
index 6e39cd1f..47230aa 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/chrome/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -5,6 +5,7 @@
 #include "chrome/browser/accessibility/browser_accessibility_manager_mac.h"
 
 #import "chrome/browser/accessibility/browser_accessibility_cocoa.h"
+#include "chrome/common/render_messages_params.h"
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
@@ -29,11 +30,11 @@ BrowserAccessibilityManagerMac::BrowserAccessibilityManagerMac(
 }
 
 void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent(
-    ViewHostMsg_AccessibilityNotification_Params::NotificationType n,
+    int type,
     BrowserAccessibility* node) {
   // Refer to AXObjectCache.mm (webkit).
   NSString* event_id = @"";
-  switch (n) {
+  switch (type) {
     case ViewHostMsg_AccessibilityNotification_Params::
         NOTIFICATION_TYPE_CHECK_STATE_CHANGED:
       // Does not exist on Mac.
diff --git a/chrome/browser/accessibility/browser_accessibility_manager_win.cc b/chrome/browser/accessibility/browser_accessibility_manager_win.cc
index 3f2c253..5720dd3 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager_win.cc
+++ b/chrome/browser/accessibility/browser_accessibility_manager_win.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/accessibility/browser_accessibility_manager_win.h"
 
 #include "chrome/browser/accessibility/browser_accessibility_win.h"
+#include "chrome/common/render_messages_params.h"
 
 using webkit_glue::WebAccessibility;
 
@@ -52,10 +53,10 @@ IAccessible* BrowserAccessibilityManagerWin::GetParentWindowIAccessible() {
 }
 
 void BrowserAccessibilityManagerWin::NotifyAccessibilityEvent(
-    ViewHostMsg_AccessibilityNotification_Params::NotificationType n,
+    int type,
     BrowserAccessibility* node) {
   LONG event_id;
-  switch (n) {
+  switch (type) {
     case ViewHostMsg_AccessibilityNotification_Params::
           NOTIFICATION_TYPE_CHECK_STATE_CHANGED:
       event_id = EVENT_OBJECT_STATECHANGE;
diff --git a/chrome/browser/accessibility/browser_accessibility_manager_win.h b/chrome/browser/accessibility/browser_accessibility_manager_win.h
index 9ee396f..8226e5e 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager_win.h
+++ b/chrome/browser/accessibility/browser_accessibility_manager_win.h
@@ -10,7 +10,6 @@
 
 #include "base/scoped_comptr_win.h"
 #include "chrome/browser/accessibility/browser_accessibility_manager.h"
-#include "chrome/common/render_messages_params.h"
 #include "webkit/glue/webaccessibility.h"
 
 class BrowserAccessibilityWin;
@@ -28,9 +27,7 @@ class BrowserAccessibilityManagerWin : public BrowserAccessibilityManager {
   IAccessible* GetParentWindowIAccessible();
 
   // BrowserAccessibilityManager methods
-  virtual void NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::NotificationType n,
-      BrowserAccessibility* node);
+  virtual void NotifyAccessibilityEvent(int type, BrowserAccessibility* node);
 
  private:
   BrowserAccessibilityManagerWin(
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm
index a36c88f..95b16d6 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm
@@ -10,6 +10,7 @@
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/test_event_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/plugins/npapi/webplugin.h"
 
 class RenderWidgetHostViewMacTest : public RenderViewHostTestHarness {
  public:
diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc
index 3133873..89f04bf 100644
--- a/chrome/renderer/blocked_plugin.cc
+++ b/chrome/renderer/blocked_plugin.cc
@@ -13,6 +13,7 @@
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 6b8761d..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 @@ void RenderView::RemoveObserver(RenderViewObserver* observer) {
 
 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 @@ void RenderView::SendPendingAccessibilityNotifications() {
       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 @@ void RenderView::postAccessibilityNotification(
   // 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++) {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 45ef726..8e05b22 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -25,7 +25,6 @@
 #include "chrome/common/edit_command.h"
 #include "chrome/common/navigation_gesture.h"
 #include "chrome/common/page_zoom.h"
-#include "chrome/common/render_messages_params.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/view_types.h"
 #include "chrome/renderer/external_popup_menu.h"
@@ -35,6 +34,7 @@
 #include "chrome/renderer/renderer_webcookiejar_impl.h"
 #include "chrome/renderer/searchbox.h"
 #include "ipc/ipc_platform_file.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
@@ -82,8 +82,14 @@ class WebPluginDelegateProxy;
 struct ContextMenuMediaParams;
 struct PP_Flash_NetAddress;
 struct ThumbnailScore;
+struct ViewHostMsg_DomMessage_Params;
+struct ViewHostMsg_GetSearchProviderInstallState_Params;
+struct ViewHostMsg_PageHasOSDD_Type;
+struct ViewHostMsg_RunFileChooser_Params;
 struct ViewMsg_ClosePage_Params;
+struct ViewMsg_ExecuteCode_Params;
 struct ViewMsg_Navigate_Params;
+struct ViewMsg_StopFinding_Params;
 struct WebApplicationInfo;
 struct WebDropData;
 
@@ -702,7 +708,7 @@ class RenderView : public RenderWidget,
     int32 id;
 
     // The accessibility notification type.
-    ViewHostMsg_AccessibilityNotification_Params::NotificationType type;
+    WebKit::WebAccessibilityNotification type;
   };
 
   enum ErrorPageType {