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

5 files changed, 10 insertions, 8 deletions

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;