Revert 78040 - Fix clang build. (Made things worse...)

BUG=none
TEST=none

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

TBR=dmazzoni@chromium.org
Review URL: http://codereview.chromium.org/6686048

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

5 files changed, 8 insertions, 10 deletions

diff --git a/views/window/dialog_delegate.cc b/views/window/dialog_delegate.cc
index aa94e87..d815a67 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::GetAccessibleWindowRole() const {
+ui::AccessibilityTypes::Role DialogDelegate::GetAccessibleRole() const {
   return ui::AccessibilityTypes::ROLE_DIALOG;
 }
 
diff --git a/views/window/dialog_delegate.h b/views/window/dialog_delegate.h
index 8e5c3e6..f28ea03 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 GetAccessibleWindowRole() const OVERRIDE;
+  virtual ui::AccessibilityTypes::Role GetAccessibleRole() const OVERRIDE;
 };
 
 }  // namespace views
diff --git a/views/window/window.cc b/views/window/window.cc
index 71f8cd8..f2313ed 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -287,10 +287,8 @@ void Window::OnNativeWindowCreated(const gfx::Rect& bounds) {
       non_client_view_);
 
   UpdateWindowTitle();
-  native_window_->SetAccessibleRole(
-      window_delegate_->GetAccessibleWindowRole());
-  native_window_->SetAccessibleState(
-      window_delegate_->GetAccessibleWindowState());
+  native_window_->SetAccessibleRole(window_delegate_->GetAccessibleRole());
+  native_window_->SetAccessibleState(window_delegate_->GetAccessibleState());
 
   SetInitialBounds(bounds);
 }
diff --git a/views/window/window_delegate.cc b/views/window/window_delegate.cc
index b39d5fb..b29b052 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::GetAccessibleWindowRole() const {
+ui::AccessibilityTypes::Role WindowDelegate::GetAccessibleRole() const {
   return ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
-ui::AccessibilityTypes::State WindowDelegate::GetAccessibleWindowState() const {
+ui::AccessibilityTypes::State WindowDelegate::GetAccessibleState() const {
   return 0;
 }
 
diff --git a/views/window/window_delegate.h b/views/window/window_delegate.h
index 379276c..9888317a 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 GetAccessibleWindowRole() const;
+  virtual ui::AccessibilityTypes::Role GetAccessibleRole() const;
 
-  virtual ui::AccessibilityTypes::State GetAccessibleWindowState() const;
+  virtual ui::AccessibilityTypes::State GetAccessibleState() const;
 
   // Returns the title to be read with screen readers.
   virtual std::wstring GetAccessibleWindowTitle() const;