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 158 matching lines @@
 #include "ui/gfx/color_palette.h"
 #include "ui/native_theme/native_theme_win.h"
 #include "ui/views/win/scoped_fullscreen_visibility.h"
 #endif
 
 #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
 #include "chrome/browser/ui/sync/one_click_signin_links_delegate_impl.h"
 #include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h"
 #endif
 
+#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#include "chrome/browser/ui/views/profiles/force_signout_dialog.h"
+#endif
+
 using base::TimeDelta;
 using base::UserMetricsAction;
 using content::NativeWebKeyboardEvent;
 using content::WebContents;
 using views::ColumnSet;
 using views::GridLayout;
 using web_modal::WebContentsModalDialogHost;
 
 namespace {
 
@@ skipping 1384 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() ||

[sky, 2017/05/12 13:15:16]

Continually adding dependencies from BrowserView onto things that want to be app
modal like doesn't scale. 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 won't depend directly on app_modal or
ForceSignoutDialog. Additionally it's easy to plug in any new app_modal like
functionality without changing BrowserView.

+       !queue->active_dialog()->native_dialog()->IsShowing())
+#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+      && !ForceSignoutDialog::IsShowing()
+#endif
+          ) {
     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();
 #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
@@ skipping 993 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 (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+  if (ForceSignoutDialog::IsShowing()) {
+    ForceSignoutDialog::ActivateModalDialog();
+    return;
+  }
+#endif
   // 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();
 }