Remove NativeViewAccessibilityWin from the views namespace because

VS2005 doesn't allow an ATL::CComObject symbol in a namespace.

BUG=none
TEST=build on VS2005, VS2008

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

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

5 files changed, 12 insertions, 14 deletions

diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
index cc6dabb..e8adbe7 100644
--- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
@@ -87,7 +87,7 @@ class BrowserViewsAccessibilityTest : public InProcessBrowserTest {
     ASSERT_TRUE(NULL != view);
 
     TestAccessibilityInfo(
-        views::NativeViewAccessibilityWin::GetAccessibleForView(view),
+        NativeViewAccessibilityWin::GetAccessibleForView(view),
         name,
         role);
   }
diff --git a/chrome/browser/autocomplete/autocomplete_accessibility.cc b/chrome/browser/autocomplete/autocomplete_accessibility.cc
index 48b59bf..c1178cd 100644
--- a/chrome/browser/autocomplete/autocomplete_accessibility.cc
+++ b/chrome/browser/autocomplete/autocomplete_accessibility.cc
@@ -59,7 +59,7 @@ STDMETHODIMP AutocompleteAccessibility::get_accParent(IDispatch** disp_parent) {
   }
 
   // Retrieve the IDispatch interface for the parent view.
-  *disp_parent = views::NativeViewAccessibilityWin::GetAccessibleForView(
+  *disp_parent = NativeViewAccessibilityWin::GetAccessibleForView(
       edit_box_->parent_view());
   // Increment the reference count for the retrieved interface.
   (*disp_parent)->AddRef();
diff --git a/views/accessibility/native_view_accessibility_win.cc b/views/accessibility/native_view_accessibility_win.cc
index 603573f..26def37 100644
--- a/views/accessibility/native_view_accessibility_win.cc
+++ b/views/accessibility/native_view_accessibility_win.cc
@@ -13,9 +13,9 @@
 using ui::AccessibilityTypes;
 
 namespace views {
-
 const char kViewsNativeHostPropForAccessibility[] =
     "Views_NativeViewHostHWNDForAccessibility";
+}
 
 // static
 scoped_refptr<NativeViewAccessibilityWin> NativeViewAccessibilityWin::Create(
@@ -732,7 +732,7 @@ HRESULT NativeViewAccessibilityWin::GetNativeIAccessibleInterface(
 
   HWND native_view_window = static_cast<HWND>(
       ui::ViewProp::GetValue(native_host->native_view(),
-                             kViewsNativeHostPropForAccessibility));
+                             views::kViewsNativeHostPropForAccessibility));
   if (!IsWindow(native_view_window)) {
     native_view_window = native_host->native_view();
   }
@@ -752,5 +752,3 @@ HRESULT NativeViewAccessibilityWin::GetNativeIAccessibleInterface(
 
   return E_FAIL;
 }
-
-}  // namespace views
diff --git a/views/accessibility/native_view_accessibility_win.h b/views/accessibility/native_view_accessibility_win.h
index 2e947e1..a62456f 100644
--- a/views/accessibility/native_view_accessibility_win.h
+++ b/views/accessibility/native_view_accessibility_win.h
@@ -17,6 +17,10 @@
 #include "views/view.h"
 
 namespace views {
+extern const char kViewsNativeHostPropForAccessibility[];
+// Note: do not put NativeViewAccessibilityWin in the namespace "views";
+// Visual Studio 2005 does not allow an ATL::CComObject symbol in a namespace.
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -163,8 +167,4 @@ class ATL_NO_VTABLE NativeViewAccessibilityWin
   DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityWin);
 };
 
-extern const char kViewsNativeHostPropForAccessibility[];
-
-}  // namespace views
-
 #endif  // VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
diff --git a/views/view.h b/views/view.h
index d19570d..1c059f1 100644
--- a/views/view.h
+++ b/views/view.h
@@ -39,6 +39,10 @@ class Transform;
 }
 using ui::ThemeProvider;
 
+#if defined(OS_WIN)
+class NativeViewAccessibilityWin;
+#endif
+
 namespace views {
 
 class Background;
@@ -51,10 +55,6 @@ class ScrollView;
 class Widget;
 class Window;
 
-#if defined(OS_WIN)
-class NativeViewAccessibilityWin;
-#endif
-
 // ContextMenuController is responsible for showing the context menu for a
 // View. To use a ContextMenuController invoke SetContextMenuController on a
 // View. When the appropriate user gesture occurs ShowContextMenu is invoked