Hide dismiss button on toast when doing partial screenshot using stylus tools.

ash/system/toast/toast_manager_unittest.cc

 // Copyright 2016 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/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
@@ skipping 36 matching lines @@
 
   ToastOverlay* GetCurrentOverlay() {
     return manager_->GetCurrentOverlayForTesting();
   }
 
   views::Widget* GetCurrentWidget() {
     ToastOverlay* overlay = GetCurrentOverlay();
     return overlay ? overlay->widget_for_testing() : nullptr;
   }
 
+  ToastOverlayButton* GetDismissButton() {
+    ToastOverlay* overlay = GetCurrentOverlay();
+    DCHECK(overlay);
+    return overlay->dismiss_button_for_testing();
+  }
+
   base::string16 GetCurrentText() {
     ToastOverlay* overlay = GetCurrentOverlay();
     return overlay ? overlay->text_ : base::string16();
   }
 
-  base::string16 GetCurrentDismissText() {
+  base::Optional<base::string16> GetCurrentDismissText() {
     ToastOverlay* overlay = GetCurrentOverlay();
     return overlay ? overlay->dismiss_text_ : base::string16();
   }
 
   void ClickDismissButton() {
     ToastOverlay* overlay = GetCurrentOverlay();
     if (overlay)
       overlay->ClickDismissButtonForTesting(DummyEvent());
   }
 
   std::string ShowToast(const std::string& text, int32_t duration) {
     std::string id = "TOAST_ID_" + base::UintToString(serial_++);
     manager()->Show(
         ToastData(id, base::ASCIIToUTF16(text), duration, base::string16()));
     return id;
   }
 
-  std::string ShowToastWithDismiss(const std::string& text,
-                                   int32_t duration,
-                                   const std::string& dismiss_text) {
+  std::string ShowToastWithDismiss(
+      const std::string& text,
+      int32_t duration,
+      const base::Optional<std::string>& dismiss_text) {
+    base::Optional<base::string16> localized_dismiss;
+    if (dismiss_text.has_value())
+      localized_dismiss = base::ASCIIToUTF16(dismiss_text.value());
+
     std::string id = "TOAST_ID_" + base::UintToString(serial_++);
-    manager()->Show(ToastData(id, base::ASCIIToUTF16(text), duration,
-                              base::ASCIIToUTF16(dismiss_text)));
+    manager()->Show(
+        ToastData(id, base::ASCIIToUTF16(text), duration, localized_dismiss));
     return id;
   }
 
   void CancelToast(const std::string& id) { manager()->Cancel(id); }
 
  private:
   ToastManager* manager_ = nullptr;
   unsigned int serial_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(ToastManagerTest);
@@ skipping 34 matching lines @@
   // Try to close it during animation.
   ClickDismissButton();
 
   while (GetCurrentWidget()->GetLayer()->GetAnimator()->is_animating())
     base::RunLoop().RunUntilIdle();
 
   // Toast isn't closed.
   EXPECT_TRUE(GetCurrentOverlay() != nullptr);
 }
 
+TEST_F(ToastManagerTest, NullMessageHasNoDismissButton) {
+  ShowToastWithDismiss("DUMMY", 10, base::Optional<std::string>());
+  base::RunLoop().RunUntilIdle();
+  EXPECT_FALSE(GetDismissButton());
+}
+
 TEST_F(ToastManagerTest, QueueMessage) {
   ShowToast("DUMMY1", 10);
   ShowToast("DUMMY2", 10);
   ShowToast("DUMMY3", 10);
 
   EXPECT_EQ(1, GetToastSerial());
   EXPECT_EQ(base::ASCIIToUTF16("DUMMY1"), GetCurrentText());
 
   while (GetToastSerial() != 2)
     base::RunLoop().RunUntilIdle();
@@ skipping 131 matching lines @@
   EXPECT_EQ(base::ASCIIToUTF16("TEXT3"), GetCurrentText());
   // Cancel the shown toast.
   CancelToast(id3);
   // Confirm that the shown toast disappears.
   EXPECT_FALSE(GetCurrentOverlay());
   // Confirm that only 1 toast is shown.
   EXPECT_EQ(2, GetToastSerial());
 }
 
 }  // namespace ash