[Chrome OS MD] Implement accessibility detailed view for the MD Ash system menu

chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index dd91408f7742a5d99c50119cae18447b1f0ed967..4e1b1dbce38266d553f5a0c960730e8cc68f0c94 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/common/accessibility_types.h"
 #include "ash/common/login_status.h"
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/magnifier/magnification_controller.h"
@@ -869,8 +870,13 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
   EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
-  EXPECT_TRUE(IsHelpShownOnDetailMenu());
-  EXPECT_TRUE(IsSettingsShownOnDetailMenu());
+  if (!ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {

[tdanderson, 2016/09/15 16:13:26]

nit (possibly personal preference): in an if-else situation, the code reads
easier if you avoid ! in the boolean expression. So:

if (IsSystemTrayMenuMaterial()) {
  ...
} else {
  ...
}

here and at line 891.

[yiyix, 2016/09/19 20:24:55]

Done.

+    EXPECT_TRUE(IsHelpShownOnDetailMenu());
+    EXPECT_TRUE(IsSettingsShownOnDetailMenu());
+  } else {
+    EXPECT_FALSE(IsHelpShownOnDetailMenu());
+    EXPECT_FALSE(IsSettingsShownOnDetailMenu());
+  }
   CloseDetailMenu();
 
   SetLoginStatus(ash::LoginStatus::LOCKED);
@@ -881,8 +887,14 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
   EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
-  EXPECT_FALSE(IsHelpShownOnDetailMenu());
-  EXPECT_FALSE(IsSettingsShownOnDetailMenu());
+
+  if (!ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
+    EXPECT_FALSE(IsHelpShownOnDetailMenu());
+    EXPECT_FALSE(IsSettingsShownOnDetailMenu());
+  } else {
+    EXPECT_FALSE(IsHelpShownOnDetailMenu());

[tdanderson, 2016/09/15 16:13:26]

EXPECT_TRUE?

[yiyix, 2016/09/19 20:24:55]

Done.

+    EXPECT_FALSE(IsSettingsShownOnDetailMenu());
+  }
   CloseDetailMenu();
 
   ash::test::TestSessionStateDelegate* session_state_delegate =