Do not show permission bubble when browser is not active

chrome/browser/permissions/permission_request_manager.cc

 // 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 "chrome/browser/permissions/permission_request_manager.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "build/build_config.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/permission_bubble/permission_prompt.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
 #include "url/origin.h"
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_list.h"
+#endif
+
 namespace {
 
 class CancelledRequest : public PermissionRequest {
  public:
   explicit CancelledRequest(PermissionRequest* cancelled)
       : icon_(cancelled->GetIconId()),
         message_fragment_(cancelled->GetMessageTextFragment()),
         origin_(cancelled->GetOrigin()) {}
   ~CancelledRequest() override {}
 
@@ skipping 46 matching lines @@
     : content::WebContentsObserver(web_contents),
       view_factory_(base::Bind(&PermissionPrompt::Create)),
       view_(nullptr),
       main_frame_has_fully_loaded_(false),
       persist_(true),
       auto_response_for_test_(NONE),
       weak_factory_(this) {
 #if defined(OS_ANDROID)
   view_ = view_factory_.Run(web_contents);
   view_->SetDelegate(this);
+#else
+  BrowserList::AddObserver(this);
 #endif
 }
 
 PermissionRequestManager::~PermissionRequestManager() {
+#if !defined(OS_ANDROID)
+  BrowserList::RemoveObserver(this);
+#endif
   if (view_ != NULL)
     view_->SetDelegate(NULL);
 
   for (PermissionRequest* request : requests_)
     request->RequestFinished();
   for (PermissionRequest* request : queued_requests_)
     request->RequestFinished();
   for (PermissionRequest* request : queued_frame_requests_)
     request->RequestFinished();
   for (const auto& entry : duplicate_requests_)
@@ skipping 257 matching lines @@
 void PermissionRequestManager::Closing() {
   std::vector<PermissionRequest*>::iterator requests_iter;
   for (requests_iter = requests_.begin();
        requests_iter != requests_.end();
        requests_iter++) {
     CancelledIncludingDuplicates(*requests_iter);
   }
   FinalizeBubble();
 }
 
+void PermissionRequestManager::OnBrowserSetLastActive(Browser* browser) {
+#if !defined(OS_ANDROID)
+  Browser* found = chrome::FindBrowserWithWebContents(web_contents());
+  if (found != browser)
+    return;
+
+  ScheduleShowBubble();
+#endif
+}
+
 void PermissionRequestManager::ScheduleShowBubble() {
   // ::ScheduleShowBubble() will be called again when the main frame will be
   // loaded.
   if (!main_frame_has_fully_loaded_)
     return;
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&PermissionRequestManager::TriggerShowBubble,
                  weak_factory_.GetWeakPtr()));
 }
 
 void PermissionRequestManager::TriggerShowBubble() {
   if (!view_)
     return;
   if (IsBubbleVisible())
     return;
   if (!main_frame_has_fully_loaded_)
     return;
   if (requests_.empty() && queued_requests_.empty() &&
       queued_frame_requests_.empty()) {
     return;
   }
+#if !defined(OS_ANDROID) && !defined(OS_MACOSX)
+  // BrowserWindow::IsActive() always return false in tests on MAC.
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
+  if (browser && !browser->window()->IsActive())
+    return;
+#endif
 
   if (requests_.empty()) {
     if (queued_requests_.size())
       requests_.swap(queued_requests_);
     else
       requests_.swap(queued_frame_requests_);
 
     // Sets the default value for each request to be 'accept'.
     accept_states_.resize(requests_.size(), true);
   }
@@ skipping 128 matching lines @@
     case DENY_ALL:
       Deny();
       break;
     case DISMISS:
       Closing();
       break;
     case NONE:
       NOTREACHED();
   }
 }