Mac: Use a "less" private API for keeping traffic lights lit while bubbles are showing

ui/views/widget/native_widget_mac_interactive_uitest.mm

 // Copyright 2014 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 "ui/views/widget/native_widget_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "ui/base/test/ui_controls.h"
 #import "ui/base/test/windowed_nsnotification_observer.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/widget_test.h"
 
 namespace views {
 namespace test {
 
 // Tests for NativeWidgetMac that rely on global window manager state, and can
 // not be parallelized.
 class NativeWidgetMacInteractiveUITest
     : public WidgetTest,
@@ skipping 128 matching lines @@
   EXPECT_TRUE([widget->GetNativeWindow() isKeyWindow]);
 }
 
 NSData* ViewAsTIFF(NSView* view) {
   NSBitmapImageRep* bitmap =
       [view bitmapImageRepForCachingDisplayInRect:[view bounds]];
   [view cacheDisplayInRect:[view bounds] toBitmapImageRep:bitmap];
   return [bitmap TIFFRepresentation];
 }
 
+class TestBubbleView : public BubbleDialogDelegateView {
+ public:
+  explicit TestBubbleView(Widget* parent) {
+    SetAnchorView(parent->GetContentsView());
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestBubbleView);
+};
+
 }  // namespace
 
 // Test that parent windows keep their traffic lights enabled when showing
 // dialogs.
 TEST_F(NativeWidgetMacInteractiveUITest, ParentWindowTrafficLights) {
   Widget* parent_widget = CreateTopLevelPlatformWidget();
   parent_widget->SetBounds(gfx::Rect(100, 100, 100, 100));
   ShowKeyWindow(parent_widget);
 
   NSWindow* parent = parent_widget->GetNativeWindow();
   EXPECT_TRUE([parent isMainWindow]);
 
   NSButton* button = [parent standardWindowButton:NSWindowCloseButton];
   EXPECT_TRUE(button);
   NSData* active_button_image = ViewAsTIFF(button);
   EXPECT_TRUE(active_button_image);
 
-  // Create an activatable frameless child. Frameless so that it doesn't have
-  // traffic lights of its own, and activatable so that it can take key status.
-  Widget* child_widget = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.native_widget = new NativeWidgetMac(child_widget);
-  params.bounds = gfx::Rect(130, 130, 100, 100);
-  params.parent = parent_widget->GetNativeView();
-  child_widget->Init(params);
-  ShowKeyWindow(child_widget);
+  // Pop open a bubble on the parent Widget. When the visibility of Bubbles with
+  // an anchor View changes, BubbleDialogDelegateView::HandleVisibilityChanged()
+  // updates Widget::SetAlwaysRenderAsActive(..) accordingly.
+  ShowKeyWindow(BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleView(parent_widget)));
 
   // Ensure the button instance is still valid.
   EXPECT_EQ(button, [parent standardWindowButton:NSWindowCloseButton]);
 
   // Parent window should still be main, and have its traffic lights active.
   EXPECT_TRUE([parent isMainWindow]);
   EXPECT_FALSE([parent isKeyWindow]);
 
   // Enabled status doesn't actually change, but check anyway.
   EXPECT_TRUE([button isEnabled]);
   NSData* button_image_with_child = ViewAsTIFF(button);
   EXPECT_TRUE([active_button_image isEqualToData:button_image_with_child]);
 
   // Verify that activating some other random window does change the button.
+  // When the bubble loses activation, it will dismiss itself and update
+  // Widget::SetAlwaysRenderAsActive().
   Widget* other_widget = CreateTopLevelPlatformWidget();
   other_widget->SetBounds(gfx::Rect(200, 200, 100, 100));
   ShowKeyWindow(other_widget);
   EXPECT_FALSE([parent isMainWindow]);
   EXPECT_FALSE([parent isKeyWindow]);
   EXPECT_TRUE([button isEnabled]);
   NSData* inactive_button_image = ViewAsTIFF(button);
   EXPECT_FALSE([active_button_image isEqualToData:inactive_button_image]);
 
   other_widget->CloseNow();
   parent_widget->CloseNow();
 }
 
 INSTANTIATE_TEST_CASE_P(NativeWidgetMacInteractiveUITestInstance,
                         NativeWidgetMacInteractiveUITest,
                         ::testing::Bool());
 
 }  // namespace test
 }  // namespace views