[Ash MD] Restore focus on detailed row when exiting detailed view

ash/common/system/tray/tray_details_view_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/tray/tray_details_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/special_popup_row.h"
 #include "ash/common/system/tray/system_tray.h"
@@ skipping 120 matching lines @@
     tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING);
     RunAllPendingInMessageLoop();
 
     return test_item->detailed_view()->tray_popup_header_button();
   }
 
   void TransitionFromDetailedToDefaultView(TestDetailsView* detailed) {
     detailed->TransitionToDefaultView();
   }
 
+  void FocusBackButton(TestDetailsView* detailed) {
+    detailed->back_button_->RequestFocus();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest);
 };
 
 TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item_1 = new TestItem;
   TestItem* test_item_2 = new TestItem;
   tray->AddTrayItem(test_item_1);
   tray->AddTrayItem(test_item_2);
 
   // Ensure the tray views are created.
   ASSERT_TRUE(test_item_1->tray_view() != NULL);
   ASSERT_TRUE(test_item_2->tray_view() != NULL);
 
   // Show the default view.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
 
   // Show the detailed view of item 2.
   tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING);
   EXPECT_TRUE(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(test_item_2->default_view());
 
   // Transition back to default view, the default view of item 2 should have
   // focus.
-  test_item_2->detailed_view()->FocusTitleRow();
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    FocusBackButton(test_item_2->detailed_view());
+  else
+    test_item_2->detailed_view()->FocusTitleRow();
   TransitionFromDetailedToDefaultView(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(test_item_2->default_view());
   EXPECT_FALSE(test_item_2->detailed_view());
   EXPECT_TRUE(test_item_2->default_view()->HasFocus());
 
   // Show the detailed view of item 2 again.
   tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING);
   EXPECT_TRUE(test_item_2->detailed_view());
@@ skipping 110 matching lines @@
   gfx::Rect bounds = button->GetBoundsInScreen();
   gfx::Point initial_point(bounds.x() - 1, bounds.y());
   generator.set_current_location(initial_point);
   generator.MoveMouseBy(1, 0);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(button->background());
 }
 
 }  // namespace test
 }  // namespace ash