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

6 files changed, 15 insertions, 13 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(