7 files changed, 63 insertions, 4 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 6d59587..b2f9da8 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1422,6 +1422,27 @@ void BrowserView::ChildPreferredSizeChanged(View* child) {
   Layout();
 }
 
+bool BrowserView::GetAccessibleRole(AccessibilityTypes::Role* role) {
+  DCHECK(role);
+
+  *role = AccessibilityTypes::ROLE_CLIENT;
+  return true;
+}
+
+bool BrowserView::GetAccessibleName(std::wstring* name) {
+  DCHECK(name);
+
+  if (!accessible_name_.empty()) {
+    *name = accessible_name_;
+    return true;
+  }
+  return false;
+}
+
+void BrowserView::SetAccessibleName(const std::wstring& name) {
+  accessible_name_ = name;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, private:
 
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index a202530..abccd5e 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -308,6 +308,11 @@ class BrowserView : public BrowserWindow,
   virtual gfx::Size GetMinimumSize();
   virtual std::string GetClassName() const;
 
+  // Overridden from views::View:
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual bool GetAccessibleName(std::wstring* name);
+  virtual void SetAccessibleName(const std::wstring& name);
+
  protected:
   // Overridden from views::View:
   virtual void Layout();
@@ -493,6 +498,9 @@ class BrowserView : public BrowserWindow,
   typedef std::set<BrowserBubble*> BubbleSet;
   BubbleSet browser_bubbles_;
 
+  // The accessible name of this view.
+  std::wstring accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 5a2f061..479954e 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -391,19 +391,19 @@ void OpaqueBrowserFrameView::ViewHierarchyChanged(bool is_add,
     // The Accessibility glue looks for the product name on these two views to
     // determine if this is in fact a Chrome window.
     GetRootView()->SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
-    SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
   }
 }
 
 bool OpaqueBrowserFrameView::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
-  // We aren't actually the client area of the window, but we act like it as
-  // far as accessibility and the UI tests are concerned.
-  *role = AccessibilityTypes::ROLE_CLIENT;
+
+  *role = AccessibilityTypes::ROLE_TITLEBAR;
   return true;
 }
 
 bool OpaqueBrowserFrameView::GetAccessibleName(std::wstring* name) {
+  DCHECK(name);
+
   if (!accessible_name_.empty()) {
     *name = accessible_name_;
     return true;
diff --git a/views/accessibility/accessibility_types.h b/views/accessibility/accessibility_types.h
index ee4d864..18365b2 100644
--- a/views/accessibility/accessibility_types.h
+++ b/views/accessibility/accessibility_types.h
@@ -30,6 +30,7 @@ class AccessibilityTypes {
     ROLE_PUSHBUTTON,
     ROLE_SEPARATOR,
     ROLE_TEXT,
+    ROLE_TITLEBAR,
     ROLE_TOOLBAR,
     ROLE_WINDOW
   };
diff --git a/views/accessibility/view_accessibility.cc b/views/accessibility/view_accessibility.cc
index f9ee1bd..72bd9f5 100644
--- a/views/accessibility/view_accessibility.cc
+++ b/views/accessibility/view_accessibility.cc
@@ -632,6 +632,8 @@ long ViewAccessibility::MSAARole(AccessibilityTypes::Role role) {
       return ROLE_SYSTEM_SEPARATOR;
     case AccessibilityTypes::ROLE_TEXT:
       return ROLE_SYSTEM_TEXT;
+    case AccessibilityTypes::ROLE_TITLEBAR:
+      return ROLE_SYSTEM_TITLEBAR;
     case AccessibilityTypes::ROLE_TOOLBAR:
       return ROLE_SYSTEM_TOOLBAR;
     case AccessibilityTypes::ROLE_WINDOW:
diff --git a/views/window/non_client_view.cc b/views/window/non_client_view.cc
index c089f76..2060eb6 100644
--- a/views/window/non_client_view.cc
+++ b/views/window/non_client_view.cc
@@ -184,6 +184,27 @@ views::View* NonClientView::GetViewForPoint(const gfx::Point& point) {
   return View::GetViewForPoint(point);
 }
 
+bool NonClientView::GetAccessibleRole(AccessibilityTypes::Role* role) {
+  DCHECK(role);
+
+  *role = AccessibilityTypes::ROLE_WINDOW;
+  return true;
+}
+
+bool NonClientView::GetAccessibleName(std::wstring* name) {
+  DCHECK(name);
+
+  if (!accessible_name_.empty()) {
+    *name = accessible_name_;
+    return true;
+  }
+  return false;
+}
+
+void NonClientView::SetAccessibleName(const std::wstring& name) {
+  accessible_name_ = name;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, View overrides:
 
diff --git a/views/window/non_client_view.h b/views/window/non_client_view.h
index 6ac38ac..797ff77 100644
--- a/views/window/non_client_view.h
+++ b/views/window/non_client_view.h
@@ -194,6 +194,9 @@ class NonClientView : public View {
   virtual gfx::Size GetPreferredSize();
   virtual gfx::Size GetMinimumSize();
   virtual void Layout();
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual bool GetAccessibleName(std::wstring* name);
+  virtual void SetAccessibleName(const std::wstring& name);
 
  protected:
   // NonClientView, View overrides:
@@ -214,6 +217,9 @@ class NonClientView : public View {
   // dynamically as the system settings change.
   scoped_ptr<NonClientFrameView> frame_view_;
 
+  // The accessible name of this view.
+  std::wstring accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(NonClientView);
 };