Improve settings override bubble to indicate policy installed extensions

chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm

 // Copyright 2015 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 "base/logging.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
+#include "chrome/grit/generated_resources.h"
+#include "components/grit/components_scaled_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
+#include "ui/gfx/vector_icons_public.h"
 
 // A simple class to observe when a window is destructing.
 @interface WindowObserver : NSObject {
   BOOL windowIsClosing_;
 }
 
 - (id)initWithWindow:(NSWindow*)window;
 
 - (void)dealloc;
 
@@ skipping 75 matching lines @@
   EXPECT_FALSE(delegate->close_action());
   EXPECT_TRUE(delegate->shown());
   return bubble;
 }
 
 void ToolbarActionsBarBubbleMacTest::TestBubbleButton(
     ToolbarActionsBarBubbleDelegate::CloseAction expected_action) {
   TestToolbarActionsBarBubbleDelegate delegate(
       HeadingString(), BodyString(), ActionString());
   delegate.set_dismiss_button_text(DismissString());
-  delegate.set_learn_more_button_text(LearnMoreString());
+
+  ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text;
+  extra_view_info_linked_text.text = LearnMoreString();
+  extra_view_info_linked_text.is_text_linked = true;
+  delegate.set_extra_view_info(extra_view_info_linked_text);
+
   ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
   base::scoped_nsobject<WindowObserver> windowObserver(
       [[WindowObserver alloc] initWithWindow:[bubble window]]);
   EXPECT_FALSE([windowObserver windowIsClosing]);
 
   // Find the appropriate button to click.
   NSButton* button = nil;
   switch (expected_action) {
     case ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE:
       button = [bubble actionButton];
       break;
     case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION:
       button = [bubble dismissButton];
       break;
     case ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE:
-      button = [bubble learnMoreButton];
+      button = [bubble link];
       break;
     case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION:
       NOTREACHED();  // Deactivation is tested below.
       break;
   }
   ASSERT_TRUE(button);
 
   // Click the button.
   std::pair<NSEvent*, NSEvent*> events =
       cocoa_test_event_utils::MouseClickInView(button, 1);
@@ skipping 16 matching lines @@
   TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE);
 
   {
     // Test dismissing the bubble without clicking the button.
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), ActionString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     base::scoped_nsobject<WindowObserver> windowObserver(
         [[WindowObserver alloc] initWithWindow:[bubble window]]);
     EXPECT_FALSE([windowObserver windowIsClosing]);
-

[Devlin, 2016/10/20 17:04:07]

nit: try not to make extraneous whitespace changes.

[catmullings, 2016/10/21 03:49:29]

Done.

     // Close the bubble. The delegate should be told it was dismissed.
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
     ASSERT_TRUE(delegate.close_action());
     EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION,
               *delegate.close_action());
     EXPECT_TRUE([windowObserver windowIsClosing]);
   }
 }
 
 // Test the basic layout of the bubble.
 TEST_F(ToolbarActionsBarBubbleMacTest, ToolbarActionsBarBubbleLayout) {
   // Test with no optional fields.
   {
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), ActionString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
-    EXPECT_FALSE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_FALSE([bubble link]);
     EXPECT_FALSE([bubble dismissButton]);
     EXPECT_FALSE([bubble itemList]);
 
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
   }
 
-  // Test with all possible buttons (action, learn more, dismiss).
+  // Test with all possible buttons (action, link, dismiss).
   {
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), ActionString());
+
+    ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text;
+    extra_view_info_linked_text.text = LearnMoreString();
+    extra_view_info_linked_text.is_text_linked = true;
+    delegate.set_extra_view_info(extra_view_info_linked_text);
+
     delegate.set_dismiss_button_text(DismissString());
-    delegate.set_learn_more_button_text(LearnMoreString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
-    EXPECT_TRUE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_TRUE([bubble link]);
     EXPECT_TRUE([bubble dismissButton]);
     EXPECT_FALSE([bubble itemList]);
 
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
   }
 
   // Test with only a dismiss button (no action button).
   {
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), base::string16());
     delegate.set_dismiss_button_text(DismissString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_FALSE([bubble actionButton]);
-    EXPECT_FALSE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_FALSE([bubble link]);
     EXPECT_TRUE([bubble dismissButton]);
     EXPECT_FALSE([bubble itemList]);
 
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
   }
 
   // Test with an action button and an item list.
   {
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), ActionString());
     delegate.set_item_list_text(ItemListString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
-    EXPECT_FALSE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_FALSE([bubble link]);
     EXPECT_FALSE([bubble dismissButton]);
     EXPECT_TRUE([bubble itemList]);
 
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
   }
 
+  // Test with an extra view of a (unlinked) text and icon and action button.
+  {
+    TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
+                                                 ActionString());
+
+    ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info;
+    extra_view_info.resource_id = gfx::VectorIconId::BUSINESS;
+    extra_view_info.text =
+        l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN);
+    extra_view_info.is_text_linked = false;
+    delegate.set_extra_view_info(extra_view_info);
+
+    ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
+    EXPECT_TRUE([bubble actionButton]);
+    EXPECT_TRUE([bubble iconView]);
+    EXPECT_TRUE([bubble label]);
+    EXPECT_FALSE([bubble link]);
+    EXPECT_FALSE([bubble dismissButton]);
+    EXPECT_FALSE([bubble itemList]);
+
+    [bubble close];
+    chrome::testing::NSRunLoopRunAllPending();
+  }
+
   // Test with all possible fields.
   {
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), ActionString());
+
+    ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text;
+    extra_view_info_linked_text.text = LearnMoreString();
+    extra_view_info_linked_text.is_text_linked = true;
+    delegate.set_extra_view_info(extra_view_info_linked_text);
+
     delegate.set_dismiss_button_text(DismissString());
-    delegate.set_learn_more_button_text(LearnMoreString());
     delegate.set_item_list_text(ItemListString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
-    EXPECT_TRUE([bubble learnMoreButton]);
+    EXPECT_FALSE([bubble iconView]);
+    EXPECT_FALSE([bubble label]);
+    EXPECT_TRUE([bubble link]);
     EXPECT_TRUE([bubble dismissButton]);
     EXPECT_TRUE([bubble itemList]);
 
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
   }
 }