Quick rename of ax_modes.h to ax_mode.h
The enum defined in the file is AXMode, so it's more
logical this way.
Uploading this required making a quick fix to a
PRESUBMIT.py script too.
BUG: none
[email protected]
Change-Id: Ic6ef5574645761767e9277e3d34568725deb383a
Reviewed-on: https://chromium-review.googlesource.com/1207353
Reviewed-by: Dominic Mazzoni <[email protected]>
Reviewed-by: Alice Boxhall <[email protected]>
Commit-Queue: Dominic Mazzoni <[email protected]>
Cr-Commit-Position: refs/heads/master@{#589035}diff --git a/content/browser/accessibility/accessibility_mode_browsertest.cc b/content/browser/accessibility/accessibility_mode_browsertest.cc
index 8bbb734..c68ecf5 100644
--- a/content/browser/accessibility/accessibility_mode_browsertest.cc
+++ b/content/browser/accessibility/accessibility_mode_browsertest.cc
@@ -18,7 +18,7 @@
#include "content/shell/browser/shell.h"
#include "content/test/accessibility_browser_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
namespace content {
diff --git a/content/browser/accessibility/browser_accessibility_com_win.cc b/content/browser/accessibility/browser_accessibility_com_win.cc
index c874c05..d729646 100644
--- a/content/browser/accessibility/browser_accessibility_com_win.cc
+++ b/content/browser/accessibility/browser_accessibility_com_win.cc
@@ -20,7 +20,7 @@
#include "content/common/accessibility_messages.h"
#include "content/public/common/content_client.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/accessibility/ax_role_properties.h"
#include "ui/accessibility/ax_text_utils.h"
#include "ui/base/win/accessibility_ids_win.h"
diff --git a/content/browser/accessibility/browser_accessibility_state_impl.h b/content/browser/accessibility/browser_accessibility_state_impl.h
index 9b57bbd..d3d09e3 100644
--- a/content/browser/accessibility/browser_accessibility_state_impl.h
+++ b/content/browser/accessibility/browser_accessibility_state_impl.h
@@ -11,8 +11,8 @@
#include "base/macros.h"
#include "base/memory/singleton.h"
#include "content/public/browser/browser_accessibility_state.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/accessibility/ax_mode_observer.h"
-#include "ui/accessibility/ax_modes.h"
namespace content {
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 2733e0d9..01f060b 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -76,7 +76,7 @@
#include "third_party/blink/public/web/commit_result.mojom.h"
#include "third_party/blink/public/web/web_text_direction.h"
#include "third_party/blink/public/web/web_tree_scope_type.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/mojo/window_open_disposition.mojom.h"
#include "ui/base/page_transition_types.h"
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 042b256..1f14fd9 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -60,7 +60,7 @@
#include "third_party/blink/public/mojom/color_chooser/color_chooser.mojom.h"
#include "third_party/blink/public/mojom/page/display_cutout.mojom.h"
#include "third_party/blink/public/platform/web_drag_operation.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/base/page_transition_types.h"
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/geometry/size.h"
diff --git a/content/common/content_param_traits.cc b/content/common/content_param_traits.cc
index cac6c15..59f0865a 100644
--- a/content/common/content_param_traits.cc
+++ b/content/common/content_param_traits.cc
@@ -19,7 +19,7 @@
#include "third_party/blink/public/common/message_port/message_port_channel.h"
#include "third_party/blink/public/common/message_port/transferable_message.h"
#include "third_party/blink/public/mojom/message_port/message_port.mojom.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/web_input_event_traits.h"
// #include "ui/gfx/ipc/geometry/gfx_param_traits.h"
diff --git a/content/common/content_param_traits.h b/content/common/content_param_traits.h
index e9a29ff..6f58e7b 100644
--- a/content/common/content_param_traits.h
+++ b/content/common/content_param_traits.h
@@ -19,7 +19,7 @@
#include "ipc/ipc_mojo_param_traits.h"
#include "storage/common/blob_storage/blob_handle.h"
#include "third_party/blink/public/platform/web_input_event.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
namespace blink {
class MessagePortChannel;
diff --git a/content/common/frame_message_enums.h b/content/common/frame_message_enums.h
index c2b16621f..85943bf1 100644
--- a/content/common/frame_message_enums.h
+++ b/content/common/frame_message_enums.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_COMMON_FRAME_MESSAGE_ENUMS_H_
#define CONTENT_COMMON_FRAME_MESSAGE_ENUMS_H_
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
struct FrameMsg_Navigate_Type {
public:
diff --git a/content/public/browser/browser_accessibility_state.h b/content/public/browser/browser_accessibility_state.h
index 3c969f9..484214b 100644
--- a/content/public/browser/browser_accessibility_state.h
+++ b/content/public/browser/browser_accessibility_state.h
@@ -8,7 +8,7 @@
#include "base/callback_forward.h"
#include "content/common/content_export.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
namespace content {
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 786eecf..73a83f9 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -33,7 +33,7 @@
#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/accessibility/ax_tree_update.h"
#include "ui/base/window_open_disposition.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/content/public/renderer/render_frame.h b/content/public/renderer/render_frame.h
index 292a3abb..77df96a 100644
--- a/content/public/renderer/render_frame.h
+++ b/content/public/renderer/render_frame.h
@@ -24,7 +24,7 @@
#include "third_party/blink/public/platform/task_type.h"
#include "third_party/blink/public/web/web_navigation_policy.h"
#include "third_party/blink/public/web/web_triggering_event_info.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
namespace blink {
class AssociatedInterfaceProvider;
diff --git a/content/renderer/accessibility/blink_ax_tree_source.h b/content/renderer/accessibility/blink_ax_tree_source.h
index 2adf7bf..81e87f0 100644
--- a/content/renderer/accessibility/blink_ax_tree_source.h
+++ b/content/renderer/accessibility/blink_ax_tree_source.h
@@ -12,7 +12,7 @@
#include "content/common/ax_content_node_data.h"
#include "third_party/blink/public/web/web_ax_object.h"
#include "third_party/blink/public/web/web_document.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/accessibility/ax_tree_source.h"
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 31ba4a12..fe1866a6 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -93,7 +93,7 @@
#include "third_party/blink/public/web/web_meaningful_layout.h"
#include "third_party/blink/public/web/web_script_execution_callback.h"
#include "third_party/blink/public/web/web_triggering_event_info.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/gfx/range/range.h"
#include "url/gurl.h"
#include "url/origin.h"
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 0647169..c1727c2 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -88,7 +88,7 @@
#include "third_party/blink/public/web/web_settings.h"
#include "third_party/blink/public/web/web_view.h"
#include "third_party/blink/public/web/web_window_features.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/events/base_event_utils.h"
#include "ui/events/event.h"
#include "ui/events/keycodes/dom/dom_code.h"
diff --git a/content/test/accessibility_browser_test_utils.h b/content/test/accessibility_browser_test_utils.h
index 93e3aaa7..5c0a4df 100644
--- a/content/test/accessibility_browser_test_utils.h
+++ b/content/test/accessibility_browser_test_utils.h
@@ -7,7 +7,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/accessibility/ax_tree.h"
diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
index fd2eac3..9232ca1 100644
--- a/ui/accessibility/BUILD.gn
+++ b/ui/accessibility/BUILD.gn
@@ -41,6 +41,8 @@
"ax_export.h",
"ax_host_delegate.cc",
"ax_host_delegate.h",
+ "ax_mode.h",
+ "ax_mode_observer.h",
"ax_node.cc",
"ax_node.h",
"ax_node_data.cc",
diff --git a/ui/accessibility/PRESUBMIT.py b/ui/accessibility/PRESUBMIT.py
index b0d4034..4465933 100644
--- a/ui/accessibility/PRESUBMIT.py
+++ b/ui/accessibility/PRESUBMIT.py
@@ -9,8 +9,8 @@
AX_MOJOM = 'ui/accessibility/ax_enums.mojom'
AUTOMATION_IDL = 'chrome/common/extensions/api/automation.idl'
-AX_JS_FILE = 'content/browser/resources/accessibility/accessibility.js'
-AX_MODE_HEADER = 'ui/accessibility/ax_modes.h'
+AX_JS_FILE = 'chrome/browser/resources/accessibility/accessibility.js'
+AX_MODE_HEADER = 'ui/accessibility/ax_mode.h'
def InitialLowerCamelCase(unix_name):
words = unix_name.split('_')
diff --git a/ui/accessibility/ax_modes.h b/ui/accessibility/ax_mode.h
similarity index 95%
rename from ui/accessibility/ax_modes.h
rename to ui/accessibility/ax_mode.h
index b601576..ac52a5e 100644
--- a/ui/accessibility/ax_modes.h
+++ b/ui/accessibility/ax_mode.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 UI_ACCESSIBILITY_PLATFORM_AX_MODE_H_
-#define UI_ACCESSIBILITY_PLATFORM_AX_MODE_H_
+#ifndef UI_ACCESSIBILITY_AX_MODE_H_
+#define UI_ACCESSIBILITY_AX_MODE_H_
namespace ui {
@@ -89,4 +89,4 @@
} // namespace ui
-#endif // UI_ACCESSIBILITY_PLATFORM_AX_MODE_H_
+#endif // UI_ACCESSIBILITY_AX_MODE_H_
diff --git a/ui/accessibility/ax_mode_observer.h b/ui/accessibility/ax_mode_observer.h
index f517c36..1f2f2af 100644
--- a/ui/accessibility/ax_mode_observer.h
+++ b/ui/accessibility/ax_mode_observer.h
@@ -6,7 +6,7 @@
#define UI_ACCESSIBILITY_PLATFORM_AX_MODE_OBSERVER_H_
#include "ui/accessibility/ax_export.h"
-#include "ui/accessibility/ax_modes.h"
+#include "ui/accessibility/ax_mode.h"
namespace ui {
diff --git a/ui/accessibility/platform/ax_platform_node.h b/ui/accessibility/platform/ax_platform_node.h
index 9430ddb..278107b 100644
--- a/ui/accessibility/platform/ax_platform_node.h
+++ b/ui/accessibility/platform/ax_platform_node.h
@@ -11,8 +11,8 @@
#include "build/build_config.h"
#include "ui/accessibility/ax_enums.mojom.h"
#include "ui/accessibility/ax_export.h"
+#include "ui/accessibility/ax_mode.h"
#include "ui/accessibility/ax_mode_observer.h"
-#include "ui/accessibility/ax_modes.h"
#include "ui/gfx/native_widget_types.h"
namespace ui {
