[Messages] Set safety tip message as an urgent priority message

This CL: 1. adds the native support of message priority 2. turns safety-tip message to an urgent priority message Urgent-priority message means: 1. if multiple messages in the queue, urgent priority message should be displayed before others 2. if a normal priority message is on the screen, it should be temporarily hidden and the urgent-priority one should be displayed instead. Bug: 1188981 Change-Id: I625915279e0f096cf6355cf3788ccbb60f8a2d49 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2976050 Commit-Queue: Lijin Shen <[email protected]> Reviewed-by: Mohamed Amir Yosef <[email protected]> Reviewed-by: Vasilii Sukhanov <[email protected]> Reviewed-by: Charlie Harrison <[email protected]> Reviewed-by: Kyle Milka <[email protected]> Reviewed-by: Joe DeBlasio <[email protected]> Reviewed-by: Pavel Yatsuk <[email protected]> Cr-Commit-Position: refs/heads/master@{#895717}
stjohnalex · Jun 24, 2021 · 8567af9 · 8567af9
1 parent 4aa6342
commit 8567af9
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 13 deletions.
diff --git a/chrome/browser/android/send_tab_to_self/android_notification_handler.cc b/chrome/browser/android/send_tab_to_self/android_notification_handler.cc
@@ -79,7 +79,8 @@ void AndroidNotificationHandler::DisplayNewEntries(
 
       // TODO(crbug.com/1220129): A valid WebContents shouldn't be needed here.
       messages::MessageDispatcherBridge::Get()->EnqueueMessage(
-          message_.get(), web_contents, messages::MessageScopeType::WINDOW);
+          message_.get(), web_contents, messages::MessageScopeType::WINDOW,
+          messages::MessagePriority::kNormal);
     } else {
       JNIEnv* env = AttachCurrentThread();
 

diff --git a/chrome/browser/autofill/android/save_address_profile_message_controller.cc b/chrome/browser/autofill/android/save_address_profile_message_controller.cc
@@ -69,7 +69,8 @@ void SaveAddressProfileMessageController::DisplayMessage(
       ResourceMapper::MapToJavaDrawableId(IDR_ANDROID_AUTOFILL_ADDRESS));
 
   messages::MessageDispatcherBridge::Get()->EnqueueMessage(
-      message_.get(), web_contents, messages::MessageScopeType::WEB_CONTENTS);
+      message_.get(), web_contents, messages::MessageScopeType::WEB_CONTENTS,
+      messages::MessagePriority::kNormal);
 }
 
 bool SaveAddressProfileMessageController::IsMessageDisplayed() {

diff --git a/chrome/browser/password_manager/android/generated_password_saved_message_delegate.cc b/chrome/browser/password_manager/android/generated_password_saved_message_delegate.cc
@@ -60,5 +60,6 @@ void GeneratedPasswordSavedMessageDelegate::ShowPrompt(
   message_->SetIconResourceId(
       ResourceMapper::MapToJavaDrawableId(IDR_ANDROID_INFOBAR_SAVE_PASSWORD));
   messages::MessageDispatcherBridge::Get()->EnqueueMessage(
-      message_.get(), web_contents, messages::MessageScopeType::NAVIGATION);
+      message_.get(), web_contents, messages::MessageScopeType::NAVIGATION,
+      messages::MessagePriority::kNormal);
 }
diff --git a/chrome/browser/password_manager/android/save_password_message_delegate.cc b/chrome/browser/password_manager/android/save_password_message_delegate.cc
@@ -97,7 +97,8 @@ void SavePasswordMessageDelegate::DisplaySavePasswordPromptInternal(
   CreateMessage(update_password);
   RecordMessageShownMetrics();
   messages::MessageDispatcherBridge::Get()->EnqueueMessage(
-      message_.get(), web_contents_, messages::MessageScopeType::NAVIGATION);
+      message_.get(), web_contents_, messages::MessageScopeType::NAVIGATION,
+      messages::MessagePriority::kNormal);
 }
 
 void SavePasswordMessageDelegate::CreateMessage(bool update_password) {

diff --git a/chrome/browser/reputation/safety_tip_message_delegate.cc b/chrome/browser/reputation/safety_tip_message_delegate.cc
@@ -57,7 +57,8 @@ void SafetyTipMessageDelegate::DisplaySafetyTipPrompt(
   message_->SetDuration(60000);
 
   messages::MessageDispatcherBridge::Get()->EnqueueMessage(
-      message_.get(), web_contents_, messages::MessageScopeType::NAVIGATION);
+      message_.get(), web_contents_, messages::MessageScopeType::NAVIGATION,
+      messages::MessagePriority::kUrgent);
 }
 
 void SafetyTipMessageDelegate::HandleLeaveSiteClick() {

diff --git a/chrome/browser/reputation/safety_tip_message_delegate_unittest.cc b/chrome/browser/reputation/safety_tip_message_delegate_unittest.cc
@@ -84,7 +84,8 @@ void SafetyTipMessageDelegateTest::EnqueueMessage(
     bool enqueue_expected,
     security_state::SafetyTipStatus safety_tip_status) {
   if (enqueue_expected) {
-    EXPECT_CALL(message_dispatcher_bridge_, EnqueueMessage);
+    EXPECT_CALL(message_dispatcher_bridge_, EnqueueMessage)
+        .WillOnce(testing::Return(true));
   } else {
     EXPECT_CALL(message_dispatcher_bridge_, EnqueueMessage).Times(0);
   }

diff --git a/components/blocked_content/android/popup_blocked_message_delegate.cc b/components/blocked_content/android/popup_blocked_message_delegate.cc
@@ -55,8 +55,8 @@ bool PopupBlockedMessageDelegate::ShowMessage(
   // or destroyed, popup blocked message will not be displayed and the
   // method will return false.
   if (!messages::MessageDispatcherBridge::Get()->EnqueueMessage(
-          message.get(), web_contents_,
-          messages::MessageScopeType::NAVIGATION)) {
+          message.get(), web_contents_, messages::MessageScopeType::NAVIGATION,
+          messages::MessagePriority::kNormal)) {
     return false;
   }
 

diff --git a/components/messages/android/message_dispatcher_bridge.cc b/components/messages/android/message_dispatcher_bridge.cc
@@ -36,12 +36,13 @@ void MessageDispatcherBridge::SetInstanceForTesting(
 
 bool MessageDispatcherBridge::EnqueueMessage(MessageWrapper* message,
                                              content::WebContents* web_contents,
-                                             MessageScopeType scopeType) {
+                                             MessageScopeType scope_type,
+                                             MessagePriority priority) {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (Java_MessageDispatcherBridge_enqueueMessage(
           env, message->GetJavaMessageWrapper(),
-          web_contents->GetJavaWebContents(), static_cast<int>(scopeType),
-          false) == JNI_TRUE) {
+          web_contents->GetJavaWebContents(), static_cast<int>(scope_type),
+          priority == MessagePriority::kUrgent) == JNI_TRUE) {
     message->SetMessageEnqueued();
     return true;
   }

diff --git a/components/messages/android/message_dispatcher_bridge.h b/components/messages/android/message_dispatcher_bridge.h
@@ -24,7 +24,8 @@ class MessageDispatcherBridge {
 
   virtual bool EnqueueMessage(MessageWrapper* message,
                               content::WebContents* web_contents,
-                              MessageScopeType scopeType);
+                              MessageScopeType scope_type,
+                              MessagePriority priority);
   virtual void DismissMessage(MessageWrapper* message,
                               content::WebContents* web_contents,
                               DismissReason dismiss_reason);

diff --git a/components/messages/android/message_enums.h b/components/messages/android/message_enums.h
@@ -45,6 +45,10 @@ enum class DismissReason {
   COUNT
 };
 
+// "Urgent" means the user should take actions ASAP, such as responding to
+// permissions or safety warnings.
+enum class MessagePriority { kUrgent, kNormal };
+
 // The constants of message scope type.
 //
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.messages

diff --git a/components/messages/android/mock_message_dispatcher_bridge.h b/components/messages/android/mock_message_dispatcher_bridge.h
@@ -19,7 +19,8 @@ class MockMessageDispatcherBridge : public MessageDispatcherBridge {
               EnqueueMessage,
               (MessageWrapper * message,
                content::WebContents* web_contents,
-               MessageScopeType scopeType),
+               MessageScopeType scope_type,
+               MessagePriority priority),
               (override));
   MOCK_METHOD(void,
               DismissMessage,