summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 16:33:48 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 16:33:48 +0000
commit64673f681549e7168f5fcb89de5935df08689138 (patch)
tree4ce2c0431f979d47bf91475b2ce08dcf8cbfb737
parent02f574ac804b054aad7243491a6434a70557d7f9 (diff)
downloadchromium_src-64673f681549e7168f5fcb89de5935df08689138.zip
chromium_src-64673f681549e7168f5fcb89de5935df08689138.tar.gz
chromium_src-64673f681549e7168f5fcb89de5935df08689138.tar.bz2
views: Move accessibility/ directory to ui/views/.
BUG=104039 R=ben@chromium.org Review URL: http://codereview.chromium.org/8533010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109894 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/accessibility/browser_views_accessibility_browsertest.cc2
-rw-r--r--ui/views/accessibility/OWNERS (renamed from views/accessibility/OWNERS)0
-rw-r--r--ui/views/accessibility/native_view_accessibility_win.cc (renamed from views/accessibility/native_view_accessibility_win.cc)4
-rw-r--r--ui/views/accessibility/native_view_accessibility_win.h (renamed from views/accessibility/native_view_accessibility_win.h)0
-rw-r--r--views/view.cc2
-rw-r--r--views/view_win.cc4
-rw-r--r--views/widget/native_widget_win.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
index bccc3c631..c51c903 100644
--- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
@@ -19,7 +19,7 @@
#include "grit/generated_resources.h"
#include "ui/base/accessibility/accessibility_types.h"
#include "ui/base/l10n/l10n_util.h"
-#include "views/accessibility/native_view_accessibility_win.h"
+#include "ui/views/accessibility/native_view_accessibility_win.h"
#include "views/widget/widget.h"
namespace {
diff --git a/views/accessibility/OWNERS b/ui/views/accessibility/OWNERS
index 11e8fd8..11e8fd8 100644
--- a/views/accessibility/OWNERS
+++ b/ui/views/accessibility/OWNERS
diff --git a/views/accessibility/native_view_accessibility_win.cc b/ui/views/accessibility/native_view_accessibility_win.cc
index 1c7bddd..8489a3e 100644
--- a/views/accessibility/native_view_accessibility_win.cc
+++ b/ui/views/accessibility/native_view_accessibility_win.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/views/accessibility/native_view_accessibility_win.h"
+
#include <atlbase.h>
#include <atlcom.h>
#include <vector>
-#include "views/accessibility/native_view_accessibility_win.h"
-
#include "third_party/iaccessible2/ia2_api_all.h"
#include "ui/base/accessibility/accessible_text_utils.h"
#include "ui/base/accessibility/accessible_view_state.h"
diff --git a/views/accessibility/native_view_accessibility_win.h b/ui/views/accessibility/native_view_accessibility_win.h
index 854f023..854f023 100644
--- a/views/accessibility/native_view_accessibility_win.h
+++ b/ui/views/accessibility/native_view_accessibility_win.h
diff --git a/views/view.cc b/views/view.cc
index 1539cc5..9d5e303 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -36,7 +36,7 @@
#if defined(OS_WIN)
#include "base/win/scoped_gdi_object.h"
-#include "views/accessibility/native_view_accessibility_win.h"
+#include "ui/views/accessibility/native_view_accessibility_win.h"
#endif
#if defined(TOOLKIT_USES_GTK)
#include "ui/base/gtk/scoped_handle_gtk.h"
diff --git a/views/view_win.cc b/views/view_win.cc
index 07de594..f8adb43 100644
--- a/views/view_win.cc
+++ b/views/view_win.cc
@@ -5,11 +5,11 @@
#include "views/view.h"
// Necessary to define oleacc GUID's.
+#include <windows.h>
#include <initguid.h>
#include <oleacc.h>
-#include <windows.h>
-#include "views/accessibility/native_view_accessibility_win.h"
+#include "ui/views/accessibility/native_view_accessibility_win.h"
namespace views {
diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc
index 878fa5a..8783a87e 100644
--- a/views/widget/native_widget_win.cc
+++ b/views/widget/native_widget_win.cc
@@ -32,8 +32,8 @@
#include "ui/gfx/native_theme_win.h"
#include "ui/gfx/path.h"
#include "ui/gfx/screen.h"
+#include "ui/views/accessibility/native_view_accessibility_win.h"
#include "ui/views/window/native_frame_view.h"
-#include "views/accessibility/native_view_accessibility_win.h"
#include "views/controls/native_control_win.h"
#include "views/controls/textfield/native_textfield_views.h"
#include "views/focus/accelerator_handler.h"