Do not activate system tray bubble by default

ash/common/system/tray/system_tray_unittest.cc

 // Copyright (c) 2012 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/system_tray.h"
 
 #include <string>
 #include <vector>
 
+#include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/tray/system_tray_bubble.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_container.h"
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/common/wm_root_window_controller.h"
@@ skipping 176 matching lines @@
   ASSERT_TRUE(tray->GetWidget());
 
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
 
   // Ensure that closing the bubble destroys it.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
   ASSERT_FALSE(tray->CloseSystemBubble());
 }
 
+// Make sure the opening system tray bubble will not deactivate the
+// other window. crbug.com/120680.
+TEST_F(SystemTrayTest, Activation) {
+  SystemTray* tray = GetPrimarySystemTray();
+  std::unique_ptr<views::Widget> widget(CreateTestWidget(
+      nullptr, kShellWindowId_DefaultContainer, gfx::Rect(0, 0, 100, 100)));
+  EXPECT_TRUE(widget->IsActive());
+
+  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
+  ASSERT_TRUE(tray->GetWidget());
+  EXPECT_FALSE(tray->GetSystemBubble()->bubble_view()->GetWidget()->IsActive());
+  EXPECT_TRUE(widget->IsActive());
+
+  tray->ActivateBubble();
+  EXPECT_TRUE(tray->GetSystemBubble()->bubble_view()->GetWidget()->IsActive());
+  EXPECT_FALSE(widget->IsActive());
+
+  // Accelerator will activate the bubble.
+  tray->CloseSystemBubble();
+
+  EXPECT_TRUE(widget->IsActive());
+  WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
+      SHOW_SYSTEM_TRAY_BUBBLE);
+  EXPECT_TRUE(tray->GetSystemBubble()->bubble_view()->GetWidget()->IsActive());
+  EXPECT_FALSE(widget->IsActive());

[James Cook, 2016/09/23 16:32:28]

Thanks for adding more tests.

+}
+
 // Opening and closing the bubble should change the coloring of the tray.
 TEST_F(SystemTrayTest, SystemTrayColoring) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
   // At the beginning the tray coloring is not active.
   ASSERT_FALSE(tray->draw_background_as_active());
 
   // Showing the system bubble should show the background as active.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   ASSERT_TRUE(tray->draw_background_as_active());
@@ skipping 222 matching lines @@
   ASSERT_TRUE(tray->GetWidget());
 
   TestSystemTrayItem* test_item = new TestSystemTrayItem();
   tray->AddTrayItem(test_item);
 
   std::unique_ptr<views::Widget> widget(CreateTestWidget(
       nullptr, kShellWindowId_DefaultContainer, gfx::Rect(0, 0, 100, 100)));
 
   // Tests for usual default view while activating a window.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
+  tray->ActivateBubble();
   ASSERT_TRUE(tray->HasSystemBubble());
   widget->Activate();
   base::RunLoop().RunUntilIdle();
   ASSERT_FALSE(tray->HasSystemBubble());
 
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   ASSERT_TRUE(tray->HasSystemBubble());
   {
     ui::test::EventGenerator& generator = GetEventGenerator();
     generator.set_current_location(gfx::Point(5, 5));
     generator.ClickLeftButton();
     ASSERT_FALSE(tray->HasSystemBubble());
   }
 
   // Same tests for persistent default view.
   tray->ShowPersistentDefaultView();
   ASSERT_TRUE(tray->HasSystemBubble());
   widget->Activate();
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(tray->HasSystemBubble());
 
   {
     ui::test::EventGenerator& generator = GetEventGenerator();
     generator.set_current_location(gfx::Point(5, 5));
     generator.ClickLeftButton();
     ASSERT_TRUE(tray->HasSystemBubble());
   }
+
+  // Same tests for persistent default view with activation.
+  tray->ShowPersistentDefaultView();
+  EXPECT_TRUE(tray->HasSystemBubble());
+  widget->Activate();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(tray->HasSystemBubble());
+
+  ui::test::EventGenerator& generator = GetEventGenerator();
+  generator.set_current_location(gfx::Point(5, 5));
+  generator.ClickLeftButton();
+  EXPECT_TRUE(tray->HasSystemBubble());
 }
 
 #if defined(OS_CHROMEOS)
 // Accessibility/Settings tray items are available only on cros.
 #define MAYBE_WithSystemModal WithSystemModal
 #else
 #define MAYBE_WithSystemModal DISABLED_WithSystemModal
 #endif
 TEST_F(SystemTrayTest, MAYBE_WithSystemModal) {
   // Check if the accessibility item is created even with system modal dialog.
@@ skipping 114 matching lines @@
   // Hide the default view, ensure the tray bubble height is back to zero.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
 }
 #endif  // OS_CHROMEOS
 
 }  // namespace test
 }  // namespace ash