Move renderer accessibility to subdir and add OWNERS

Creates a subdirectory for accessibility in
content/renderer and adds an OWNERS file that
matches content/browser/accessibility.

Adds per-file OWNERS for accessibility-only files
in content/common. The exception is the IPC file,
just to be safe - this still requires separate
review when changed:
content/common/accessibility_messages.h


Review URL: https://chromiumcodereview.appspot.com/12226061

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

14 files changed, 38 insertions, 32 deletions

diff --git a/content/common/OWNERS b/content/common/OWNERS
index 8bd6e71..875a13a 100644
--- a/content/common/OWNERS
+++ b/content/common/OWNERS
@@ -19,3 +19,7 @@ per-file *_messages.h=jln@chromium.org
 per-file *_messages.h=jschuh@chromium.org
 per-file *_messages.h=palmer@chromium.org
 per-file *_messages.h=tsepez@chromium.org
+
+# Accessibility
+per-file accessibility_node_data.*=dmazzoni@chromium.org
+per-file accessibility_node_data.*=dtseng@chromium.org
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index b08783c..453eecde 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -46,8 +46,14 @@
     'public/renderer/render_view_observer_tracker.h',
     'public/renderer/render_view_visitor.h',
     'public/renderer/v8_value_converter.h',
-    'renderer/accessibility_node_serializer.cc',
-    'renderer/accessibility_node_serializer.h',
+    'renderer/accessibility/accessibility_node_serializer.cc',
+    'renderer/accessibility/accessibility_node_serializer.h',
+    'renderer/accessibility/renderer_accessibility.cc',
+    'renderer/accessibility/renderer_accessibility.h',
+    'renderer/accessibility/renderer_accessibility_complete.cc',
+    'renderer/accessibility/renderer_accessibility_complete.h',
+    'renderer/accessibility/renderer_accessibility_focus_only.cc',
+    'renderer/accessibility/renderer_accessibility_focus_only.h',
     'renderer/active_notification_tracker.cc',
     'renderer/active_notification_tracker.h',
     'renderer/all_rendering_benchmarks.cc',
@@ -250,12 +256,6 @@
     'renderer/render_widget_fullscreen.h',
     'renderer/render_widget_fullscreen_pepper.cc',
     'renderer/render_widget_fullscreen_pepper.h',
-    'renderer/renderer_accessibility.cc',
-    'renderer/renderer_accessibility.h',
-    'renderer/renderer_accessibility_complete.cc',
-    'renderer/renderer_accessibility_complete.h',
-    'renderer/renderer_accessibility_focus_only.cc',
-    'renderer/renderer_accessibility_focus_only.h',
     'renderer/renderer_clipboard_client.cc',
     'renderer/renderer_clipboard_client.h',
     'renderer/renderer_date_time_picker.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 40a3f2f..e81c6ab 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -744,6 +744,7 @@
             'browser/worker_host/test/worker_browsertest.cc',
             'common/content_constants_internal.cc',
             'common/content_constants_internal.h',
+            'renderer/accessibility/renderer_accessibility_browsertest.cc',
             'renderer/browser_plugin/mock_browser_plugin.h',
             'renderer/browser_plugin/mock_browser_plugin.cc',
             'renderer/browser_plugin/mock_browser_plugin_manager.h',
@@ -758,7 +759,6 @@
             'renderer/render_view_browsertest.cc',
             'renderer/render_view_browsertest_mac.mm',
             'renderer/render_widget_browsertest.cc',
-            'renderer/renderer_accessibility_browsertest.cc',
             'renderer/web_intents_host_browsertest.cc',
             'test/browser_test_message_pump_android.cc',
             'test/browser_test_message_pump_android.h',
diff --git a/content/renderer/accessibility/OWNERS b/content/renderer/accessibility/OWNERS
new file mode 100644
index 0000000..11e8fd8
--- /dev/null
+++ b/content/renderer/accessibility/OWNERS
@@ -0,0 +1,2 @@
+dmazzoni@chromium.org
+dtseng@chromium.org
diff --git a/content/renderer/accessibility_node_serializer.cc b/content/renderer/accessibility/accessibility_node_serializer.cc
index c457c3c..58ef8f8 100644
--- a/content/renderer/accessibility_node_serializer.cc
+++ b/content/renderer/accessibility/accessibility_node_serializer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/accessibility_node_serializer.h"
+#include "content/renderer/accessibility/accessibility_node_serializer.h"
 
 #include <set>
 
diff --git a/content/renderer/accessibility_node_serializer.h b/content/renderer/accessibility/accessibility_node_serializer.h
index 3caca8b..d0fd74b 100644
--- a/content/renderer/accessibility_node_serializer.h
+++ b/content/renderer/accessibility/accessibility_node_serializer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_ACCESSIBILITY_NODE_SERIALIZER_H_
-#define CONTENT_RENDERER_ACCESSIBILITY_NODE_SERIALIZER_H_
+#ifndef CONTENT_RENDERER_ACCESSIBILITY_ACCESSIBILITY_NODE_SERIALIZER_H_
+#define CONTENT_RENDERER_ACCESSIBILITY_ACCESSIBILITY_NODE_SERIALIZER_H_
 
 #include "content/common/accessibility_node_data.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
@@ -17,4 +17,4 @@ void SerializeAccessibilityNode(
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_ACCESSIBILITY_NODE_SERIALIZER_H_
+#endif  // CONTENT_RENDERER_ACCESSIBILITY_ACCESSIBILITY_NODE_SERIALIZER_H_
diff --git a/content/renderer/renderer_accessibility.cc b/content/renderer/accessibility/renderer_accessibility.cc
index 63729cc..ec282ca 100644
--- a/content/renderer/renderer_accessibility.cc
+++ b/content/renderer/accessibility/renderer_accessibility.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/renderer_accessibility.h"
+#include "content/renderer/accessibility/renderer_accessibility.h"
 
 #include "base/command_line.h"
 #include "content/public/common/content_switches.h"
diff --git a/content/renderer/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h
index f6075a7..8f33d2b 100644
--- a/content/renderer/renderer_accessibility.h
+++ b/content/renderer/accessibility/renderer_accessibility.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_RENDERER_ACCESSIBILITY_H_
-#define CONTENT_RENDERER_RENDERER_ACCESSIBILITY_H_
+#ifndef CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_
+#define CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_
 
 #include "content/common/accessibility_messages.h"
 #include "content/public/renderer/render_view_observer.h"
@@ -80,4 +80,4 @@ class RendererAccessibility : public RenderViewObserver {
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_RENDERER_ACCESSIBILITY_H_
+#endif  // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_
diff --git a/content/renderer/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
index 24b90db..304822e 100644
--- a/content/renderer/renderer_accessibility_browsertest.cc
+++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -6,8 +6,8 @@
 #include "content/common/accessibility_messages.h"
 #include "content/common/accessibility_node_data.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_view_impl.h"
 #include "content/public/test/render_view_test.h"
+#include "content/renderer/render_view_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
diff --git a/content/renderer/renderer_accessibility_complete.cc b/content/renderer/accessibility/renderer_accessibility_complete.cc
index 1e203b3..58a8243 100644
--- a/content/renderer/renderer_accessibility_complete.cc
+++ b/content/renderer/accessibility/renderer_accessibility_complete.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/renderer_accessibility_complete.h"
+#include "content/renderer/accessibility/renderer_accessibility_complete.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "content/renderer/accessibility_node_serializer.h"
+#include "content/renderer/accessibility/accessibility_node_serializer.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
diff --git a/content/renderer/renderer_accessibility_complete.h b/content/renderer/accessibility/renderer_accessibility_complete.h
index ebae664..e03c0e9 100644
--- a/content/renderer/renderer_accessibility_complete.h
+++ b/content/renderer/accessibility/renderer_accessibility_complete.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_RENDERER_ACCESSIBILITY_COMPLETE_H_
-#define CONTENT_RENDERER_RENDERER_ACCESSIBILITY_COMPLETE_H_
+#ifndef CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_
+#define CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_
 
 #include <vector>
 
@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "content/common/accessibility_node_data.h"
 #include "content/public/renderer/render_view_observer.h"
-#include "content/renderer/renderer_accessibility.h"
+#include "content/renderer/accessibility/renderer_accessibility.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h"
 
 namespace WebKit {
@@ -135,6 +135,6 @@ class RendererAccessibilityComplete : public RendererAccessibility {
   DISALLOW_COPY_AND_ASSIGN(RendererAccessibilityComplete);
 };
 
-#endif  // CONTENT_RENDERER_RENDERER_ACCESSIBILITY_COMPLETE_H_
+#endif  // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_COMPLETE_H_
 
 }  // namespace content
diff --git a/content/renderer/renderer_accessibility_focus_only.cc b/content/renderer/accessibility/renderer_accessibility_focus_only.cc
index 53020eb..601bc16 100644
--- a/content/renderer/renderer_accessibility_focus_only.cc
+++ b/content/renderer/accessibility/renderer_accessibility_focus_only.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/renderer_accessibility_focus_only.h"
+#include "content/renderer/accessibility/renderer_accessibility_focus_only.h"
 
 #include "content/common/accessibility_node_data.h"
 #include "content/renderer/render_view_impl.h"
diff --git a/content/renderer/renderer_accessibility_focus_only.h b/content/renderer/accessibility/renderer_accessibility_focus_only.h
index 6b2eb9f..08d84e3 100644
--- a/content/renderer/renderer_accessibility_focus_only.h
+++ b/content/renderer/accessibility/renderer_accessibility_focus_only.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_RENDERER_ACCESSIBILITY_FOCUS_ONLY_H_
-#define CONTENT_RENDERER_RENDERER_ACCESSIBILITY_FOCUS_ONLY_H_
+#ifndef CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_FOCUS_ONLY_H_
+#define CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_FOCUS_ONLY_H_
 
-#include "content/renderer/renderer_accessibility.h"
+#include "content/renderer/accessibility/renderer_accessibility.h"
 
 namespace content {
 
@@ -72,4 +72,4 @@ class RendererAccessibilityFocusOnly : public RendererAccessibility {
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_RENDERER_ACCESSIBILITY_FOCUS_ONLY_H_
+#endif  // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_FOCUS_ONLY_H_
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index e15789b..5867b19 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -64,6 +64,9 @@
 #include "content/public/renderer/password_form_conversion_utils.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
+#include "content/renderer/accessibility/renderer_accessibility.h"
+#include "content/renderer/accessibility/renderer_accessibility_complete.h"
+#include "content/renderer/accessibility/renderer_accessibility_focus_only.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
@@ -102,9 +105,6 @@
 #include "content/renderer/render_view_impl_params.h"
 #include "content/renderer/render_view_mouse_lock_dispatcher.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
-#include "content/renderer/renderer_accessibility.h"
-#include "content/renderer/renderer_accessibility_complete.h"
-#include "content/renderer/renderer_accessibility_focus_only.h"
 #include "content/renderer/renderer_date_time_picker.h"
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
 #include "content/renderer/renderer_webcolorchooser_impl.h"