If force-sign-in policy is enabled, popup warning dialog before window closing if auth token becom…

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 2012 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/ui/views/frame/browser_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 43 matching lines @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/accelerator_table.h"
 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
+#include "chrome/browser/ui/views/browser_modal_dialog.h"
 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/find_bar_host.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"
 #include "chrome/browser/ui/views/frame/contents_layout_manager.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
@@ skipping 1499 matching lines @@
   return true;
 }
 
 bool BrowserView::CanMinimize() const {
   return true;
 }
 
 bool BrowserView::CanActivate() const {
   app_modal::AppModalDialogQueue* queue =
       app_modal::AppModalDialogQueue::GetInstance();
-  if (!queue->active_dialog() || !queue->active_dialog()->native_dialog() ||
-      !queue->active_dialog()->native_dialog()->IsShowing()) {
+  if ((!queue->active_dialog() || !queue->active_dialog()->native_dialog() ||
+       !queue->active_dialog()->native_dialog()->IsShowing()) &&
+      !BrowserModalDialogList::GetInstance()->IsShowing()) {

[sky, 2017/05/16 12:40:33]

This has BrowserView needing to know about both types. As I requested earlier,
"So, please introduce a pure virtual class that BrowserView talks to that has an
implementation wrapping app_modal, and another wrapping your class." This way
BrowserView *only* talks to BrowserModalDialog. Not BrowserModalDialog *and*
app_modal.

[zmin, 2017/05/16 22:22:02]

Done.

     return true;
   }
 
 #if defined(USE_AURA) && defined(OS_CHROMEOS)
   // On Aura window manager controls all windows so settings focus via PostTask
   // will make only worse because posted task will keep trying to steal focus.
-  queue->ActivateModalDialog();
+  if (!BrowserModalDialogList::GetInstance()->ActivateModalDialog())
+    queue->ActivateModalDialog();
 #else
   // If another browser is app modal, flash and activate the modal browser. This
   // has to be done in a post task, otherwise if the user clicked on a window
   // that doesn't have the modal dialog the windows keep trying to get the focus
   // from each other on Windows. http://crbug.com/141650.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(&BrowserView::ActivateAppModalDialog,
                                 activate_modal_dialog_factory_.GetWeakPtr()));
 #endif
   return false;
@@ skipping 986 matching lines @@
   content::RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView();
   if (!rwhv || !rwhv->HasFocus())
     return false;
   // Calling |method| rather than using a fake key event is important since a
   // fake event might be consumed by the web content.
   (contents->*method)();
   return true;
 }
 
 void BrowserView::ActivateAppModalDialog() const {
+  if (BrowserModalDialogList::GetInstance()->ActivateModalDialog())
+    return;
   // If another browser is app modal, flash and activate the modal browser.
   app_modal::AppModalDialog* active_dialog =
       app_modal::AppModalDialogQueue::GetInstance()->active_dialog();
   if (!active_dialog)
     return;
 
   Browser* modal_browser =
       chrome::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_.get() != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
@@ skipping 84 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }