Fix clang build (tested on trybots this time!).

Move AccessibleViewState constructor into a .cc file.
Add dependency on ui/base to views_unittests so that
it actually compiles source files in ui/base.

Rename WindowDelegate::GetAccessibleState to
WindowDelegate::GetAccessibleWindowState so that it
doesn't conflict with View::GetAccessibleState in
BrowserView, which inherits from both. This was a real
bug, introduced recently because both GetAccessibleState
methods were renamed from previous non-conflicting
method names.

BUG=none
TEST=none

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

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

10 files changed, 34 insertions, 16 deletions

diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
index e8adbe7..6036125 100644
--- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
@@ -256,7 +256,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
   EXPECT_STREQ(
       about_chrome_window->window_delegate()->GetWindowTitle().c_str(),
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)).c_str());
-  EXPECT_EQ(about_chrome_window->window_delegate()->GetAccessibleRole(),
+  EXPECT_EQ(about_chrome_window->window_delegate()->GetAccessibleWindowRole(),
             ui::AccessibilityTypes::ROLE_DIALOG);
 
   // Also test the accessibility object directly.
diff --git a/ui/base/accessibility/accessible_view_state.cc b/ui/base/accessibility/accessible_view_state.cc
new file mode 100644
index 0000000..ff1d3e6
--- /dev/null
+++ b/ui/base/accessibility/accessible_view_state.cc
@@ -0,0 +1,19 @@
+// 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 "ui/base/accessibility/accessible_view_state.h"
+
+namespace ui {
+
+AccessibleViewState::AccessibleViewState()
+    : role(AccessibilityTypes::ROLE_CLIENT),
+      state(0),
+      selection_start(-1),
+      selection_end(-1),
+      index(-1),
+      count(-1) { }
+
+AccessibleViewState::~AccessibleViewState() { }
+
+}  // namespace ui
diff --git a/ui/base/accessibility/accessible_view_state.h b/ui/base/accessibility/accessible_view_state.h
index 2f36a4b..6bae897 100644
--- a/ui/base/accessibility/accessible_view_state.h
+++ b/ui/base/accessibility/accessible_view_state.h
@@ -22,13 +22,8 @@ namespace ui {
 ////////////////////////////////////////////////////////////////////////////////
 struct AccessibleViewState {
  public:
-  AccessibleViewState()
-      : role(AccessibilityTypes::ROLE_CLIENT),
-        state(0),
-        selection_start(-1),
-        selection_end(-1),
-        index(-1),
-        count(-1) { }
+  AccessibleViewState();
+  ~AccessibleViewState();
 
   // The view's role, like button or list box.
   AccessibilityTypes::Role role;
diff --git a/ui/base/ui_base.gypi b/ui/base/ui_base.gypi
index cd66942..8bb0135 100644
--- a/ui/base/ui_base.gypi
+++ b/ui/base/ui_base.gypi
@@ -59,6 +59,7 @@
       'sources': [
         'accessibility/accessibility_types.h',
         'accessibility/accessible_view_state.h',
+        'accessibility/accessible_view_state.cc',
         'animation/animation.cc',
         'animation/animation.h',
         'animation/animation_container.cc',
diff --git a/views/views.gyp b/views/views.gyp
index 13d81b9..874ce24 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -68,6 +68,7 @@
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
+        '../ui/ui.gyp:ui_base',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
       ],
       'sources': [
diff --git a/views/window/dialog_delegate.cc b/views/window/dialog_delegate.cc
index d815a67..aa94e87 100644
--- a/views/window/dialog_delegate.cc
+++ b/views/window/dialog_delegate.cc
@@ -98,7 +98,7 @@ DialogClientView* DialogDelegate::GetDialogClientView() const {
   return window()->client_view()->AsDialogClientView();
 }
 
-ui::AccessibilityTypes::Role DialogDelegate::GetAccessibleRole() const {
+ui::AccessibilityTypes::Role DialogDelegate::GetAccessibleWindowRole() const {
   return ui::AccessibilityTypes::ROLE_DIALOG;
 }
 
diff --git a/views/window/dialog_delegate.h b/views/window/dialog_delegate.h
index f28ea03..8e5c3e6 100644
--- a/views/window/dialog_delegate.h
+++ b/views/window/dialog_delegate.h
@@ -110,7 +110,7 @@ class DialogDelegate : public WindowDelegate {
 
  protected:
   // Overridden from WindowDelegate:
-  virtual ui::AccessibilityTypes::Role GetAccessibleRole() const OVERRIDE;
+  virtual ui::AccessibilityTypes::Role GetAccessibleWindowRole() const OVERRIDE;
 };
 
 }  // namespace views
diff --git a/views/window/window.cc b/views/window/window.cc
index f2313ed..71f8cd8 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -287,8 +287,10 @@ void Window::OnNativeWindowCreated(const gfx::Rect& bounds) {
       non_client_view_);
 
   UpdateWindowTitle();
-  native_window_->SetAccessibleRole(window_delegate_->GetAccessibleRole());
-  native_window_->SetAccessibleState(window_delegate_->GetAccessibleState());
+  native_window_->SetAccessibleRole(
+      window_delegate_->GetAccessibleWindowRole());
+  native_window_->SetAccessibleState(
+      window_delegate_->GetAccessibleWindowState());
 
   SetInitialBounds(bounds);
 }
diff --git a/views/window/window_delegate.cc b/views/window/window_delegate.cc
index b29b052..b39d5fb 100644
--- a/views/window/window_delegate.cc
+++ b/views/window/window_delegate.cc
@@ -36,11 +36,11 @@ bool WindowDelegate::IsModal() const {
   return false;
 }
 
-ui::AccessibilityTypes::Role WindowDelegate::GetAccessibleRole() const {
+ui::AccessibilityTypes::Role WindowDelegate::GetAccessibleWindowRole() const {
   return ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
-ui::AccessibilityTypes::State WindowDelegate::GetAccessibleState() const {
+ui::AccessibilityTypes::State WindowDelegate::GetAccessibleWindowState() const {
   return 0;
 }
 
diff --git a/views/window/window_delegate.h b/views/window/window_delegate.h
index 9888317a..379276c 100644
--- a/views/window/window_delegate.h
+++ b/views/window/window_delegate.h
@@ -53,9 +53,9 @@ class WindowDelegate {
   // opened it. Only windows with WindowType == DIALOG can be modal.
   virtual bool IsModal() const;
 
-  virtual ui::AccessibilityTypes::Role GetAccessibleRole() const;
+  virtual ui::AccessibilityTypes::Role GetAccessibleWindowRole() const;
 
-  virtual ui::AccessibilityTypes::State GetAccessibleState() const;
+  virtual ui::AccessibilityTypes::State GetAccessibleWindowState() const;
 
   // Returns the title to be read with screen readers.
   virtual std::wstring GetAccessibleWindowTitle() const;