[Accessibility] Chrome's main window is missing an accessible name

BUG=36732
TEST=Verify Chrome's main window has a name in AccExplorer or run the new test. 

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

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

3 files changed, 17 insertions, 1 deletions

diff --git a/chrome/browser/views/browser_views_accessibility_browsertest.cc b/chrome/browser/views/browser_views_accessibility_browsertest.cc
index ea7fde0..f44e5cd 100644
--- a/chrome/browser/views/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/views/browser_views_accessibility_browsertest.cc
@@ -17,6 +17,7 @@
 #include "views/accessibility/view_accessibility_wrapper.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
+#include "views/window/window.h"
 
 namespace {
 
@@ -97,6 +98,7 @@ class BrowserViewsAccessibilityTest : public InProcessBrowserTest {
     TestAccessibilityInfo(acc_obj, name, role);
   }
 
+
   // Verifies MSAA Name and Role properties of the given IAccessible.
   void TestAccessibilityInfo(IAccessible* acc_obj, std::wstring name,
                              long role) {
@@ -142,6 +144,17 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, TestChromeWindowAccObj) {
   acc_obj->Release();
 }
 
+// Retrieve accessibility object for non client view and verify accessibility
+// info.
+IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, TestNonClientViewAccObj) {
+  views::View* non_client_view =
+  GetBrowserView()->GetWindow()->GetNonClientView();
+
+  TestViewAccessibilityObject(non_client_view,
+  l10n_util::GetString(IDS_PRODUCT_NAME),
+  ROLE_SYSTEM_WINDOW);
+}
+
 // Retrieve accessibility object for browser root view and verify
 // accessibility info.
 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
@@ -254,6 +267,5 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
                               l10n_util::GetString(IDS_ACCNAME_BOOKMARKS),
                               ROLE_SYSTEM_TOOLBAR);
 }
-
 }  // Namespace.
 
diff --git a/views/views.gyp b/views/views.gyp
index 5981083..42530ea 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -42,6 +42,7 @@
         '../app/app.gyp:app_base',
         '../app/app.gyp:app_strings',
         '../app/app.gyp:app_resources',
+        '../chrome/chrome.gyp:chrome_strings',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
diff --git a/views/window/non_client_view.cc b/views/window/non_client_view.cc
index fcf4353..20d848b 100644
--- a/views/window/non_client_view.cc
+++ b/views/window/non_client_view.cc
@@ -4,7 +4,9 @@
 
 #include "views/window/non_client_view.h"
 
+#include "app/l10n_util.h"
 #include "app/theme_provider.h"
+#include "grit/chromium_strings.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
@@ -33,6 +35,7 @@ static const int kClientViewIndex = 1;
 NonClientView::NonClientView(Window* frame)
     : frame_(frame),
       client_view_(NULL) {
+  SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 }
 
 NonClientView::~NonClientView() {