Move accessibility_events.* to chrome/browser/accessibility

BUG=None
TEST=try bots (win,mac,linux,linux_chromeos)


Review URL: http://codereview.chromium.org/8718005

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

10 files changed, 19 insertions, 20 deletions

diff --git a/chrome/browser/accessibility_events.cc b/chrome/browser/accessibility/accessibility_events.cc
index 3a6c405..156eed7 100644
--- a/chrome/browser/accessibility_events.cc
+++ b/chrome/browser/accessibility/accessibility_events.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 "chrome/browser/accessibility_events.h"
+#include "chrome/browser/accessibility/accessibility_events.h"
 
 #include "base/values.h"
 
@@ -15,8 +15,7 @@
 
 namespace keys = extension_accessibility_api_constants;
 
-void SendAccessibilityNotification(
-    int type, AccessibilityEventInfo* info) {
+void SendAccessibilityNotification(int type, AccessibilityEventInfo* info) {
   Profile *profile = info->profile();
   if (profile->ShouldSendAccessibilityEvents()) {
     content::NotificationService::current()->Notify(
diff --git a/chrome/browser/accessibility_events.h b/chrome/browser/accessibility/accessibility_events.h
index fcf54a9..51621db 100644
--- a/chrome/browser/accessibility_events.h
+++ b/chrome/browser/accessibility/accessibility_events.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 CHROME_BROWSER_ACCESSIBILITY_EVENTS_H_
-#define CHROME_BROWSER_ACCESSIBILITY_EVENTS_H_
+#ifndef CHROME_BROWSER_ACCESSIBILITY_ACCESSIBILITY_EVENTS_H_
+#define CHROME_BROWSER_ACCESSIBILITY_ACCESSIBILITY_EVENTS_H_
 #pragma once
 
 #include <string>
@@ -20,8 +20,8 @@ class DictionaryValue;
 // notification type with AccessibilityEventInfo details to any
 // listeners.  Will not send if the profile's pause level is nonzero
 // (using profile->PauseAccessibilityEvents).
-void SendAccessibilityNotification(
-    int type, AccessibilityEventInfo* info);
+void SendAccessibilityNotification(int type, AccessibilityEventInfo* info);
+
 void SendAccessibilityVolumeNotification(double volume, bool is_muted);
 
 // Abstract parent class for accessibility event information passed to event
@@ -288,14 +288,14 @@ class AccessibilityVolumeInfo : public AccessibilityEventInfo {
 // Screen unlock event information; this class is used by onScreenUnlocked.
 class ScreenUnlockedEventInfo : public AccessibilityEventInfo {
  public:
-  ScreenUnlockedEventInfo(Profile* profile);
+  explicit ScreenUnlockedEventInfo(Profile* profile);
   virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 };
 
 // Wake up event information; this class is used by onWokeUp.
 class WokeUpEventInfo : public AccessibilityEventInfo {
  public:
-  WokeUpEventInfo(Profile* profile);
+  explicit WokeUpEventInfo(Profile* profile);
   virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 };
 
@@ -324,4 +324,4 @@ class AccessibilityMenuItemInfo : public AccessibilityControlInfo {
   int item_count_;
 };
 
-#endif  // CHROME_BROWSER_ACCESSIBILITY_EVENTS_H_
+#endif  // CHROME_BROWSER_ACCESSIBILITY_ACCESSIBILITY_EVENTS_H_
diff --git a/chrome/browser/accessibility/accessibility_extension_api.h b/chrome/browser/accessibility/accessibility_extension_api.h
index 17ecaf4..d13a5bf 100644
--- a/chrome/browser/accessibility/accessibility_extension_api.h
+++ b/chrome/browser/accessibility/accessibility_extension_api.h
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
 #include "base/values.h"
-#include "chrome/browser/accessibility_events.h"
+#include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/chromeos/accessibility/system_event_observer.cc b/chrome/browser/chromeos/accessibility/system_event_observer.cc
index 85415b4..9972e4b 100644
--- a/chrome/browser/chromeos/accessibility/system_event_observer.cc
+++ b/chrome/browser/chromeos/accessibility/system_event_observer.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/accessibility/system_event_observer.h"
 
 #include "base/logging.h"
-#include "chrome/browser/accessibility_events.h"
+#include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
index 462839e..b9d8a0b 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
@@ -10,9 +10,9 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
-#include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
+#include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_handler_unittest.cc b/chrome/browser/chromeos/login/wizard_accessibility_handler_unittest.cc
index 9d2f878..f5c04ba 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_handler_unittest.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_handler_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/accessibility_events.h"
+#include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_handler.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
index 6623fc4..84c95fc 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -9,7 +9,7 @@
 #include <X11/XF86keysym.h>
 #include <X11/XKBlib.h>
 
-#include "chrome/browser/accessibility_events.h"
+#include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/chromeos/audio_handler.h"
 #include "chrome/browser/chromeos/brightness_bubble.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index c6f0dd6..79b5396 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -15,7 +15,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/accessibility_events.h"
+#include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/command_updater.h"
diff --git a/chrome/browser/ui/views/accessibility_event_router_views.h b/chrome/browser/ui/views/accessibility_event_router_views.h
index 9956441..04d6282 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views.h
+++ b/chrome/browser/ui/views/accessibility_event_router_views.h
@@ -13,7 +13,7 @@
 #include "base/memory/singleton.h"
 #include "base/string16.h"
 #include "base/task.h"
-#include "chrome/browser/accessibility_events.h"
+#include "chrome/browser/accessibility/accessibility_events.h"
 #include "ui/base/accessibility/accessibility_types.h"
 
 class Profile;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 09b7f49..4861df7 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -79,12 +79,12 @@
         # mocks.
         'browser/about_flags.cc',
         'browser/about_flags.h',
-        'browser/accessibility_events.cc',
-        'browser/accessibility_events.h',
         'browser/accessibility/accessibility_extension_api.cc',
         'browser/accessibility/accessibility_extension_api.h',
         'browser/accessibility/accessibility_extension_api_constants.cc',
         'browser/accessibility/accessibility_extension_api_constants.h',
+        'browser/accessibility/accessibility_events.cc',
+        'browser/accessibility/accessibility_events.h',
         'browser/aeropeek_manager.cc',
         'browser/aeropeek_manager.h',
         'browser/alternate_nav_url_fetcher.cc',