Don't force an interstitial when showing a login prompt for a standalone app

chrome/browser/ui/login/login_handler.cc

 // Copyright (c) 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/login/login_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/origin_util.h"
 #include "extensions/features/features.h"
 #include "net/base/auth.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_auth_scheme.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 545 matching lines @@
     // hosted by a tab (e.g. an extension). Cancel just in case (canceling twice
     // is a no-op).
     handler->CancelAuth();
     return;
   }
 
   // Check if this is a main frame navigation and
   // (a) if the request is cross origin or
   // (b) if an interstitial is already being shown or
   // (c) the prompt is for proxy authentication
+  // (d) we're not displaying a standalone app
   //
   // For (a), there are two different ways the navigation can occur:
   // 1- The user enters the resource URL in the omnibox.
   // 2- The page redirects to the resource.
   // In both cases, the last committed URL is different than the resource URL,
   // so checking it is sufficient.
   // Note that (1) will not be true once site isolation is enabled, as any
   // navigation could cause a cross-process swap, including link clicks.
   //
   // For (b), the login interstitial should always replace an existing
   // interstitial. This is because |LoginHandler::CloseContentsDeferred| tries
   // to proceed whatever interstitial is being shown when the login dialog is
   // closed, so that interstitial should only be a login interstitial.
   //
   // For (c), the authority information in the omnibox will be (and should be)
   // different from the authority information in the authentication prompt. An
   // interstitial with an empty URL clears the omnibox and reduces the possible
   // user confusion that may result from the different authority information
   // being displayed simultaneously. This is specially important when the proxy
   // is accessed via an open connection while the target server is considered
   // secure.
   const bool is_cross_origin_request =
       parent_contents->GetLastCommittedURL().GetOrigin() !=
       request_url.GetOrigin();
   if (is_main_frame &&
       (is_cross_origin_request || parent_contents->ShowingInterstitialPage() ||
-       auth_info->is_proxy)) {
+       auth_info->is_proxy) &&
+      parent_contents->GetDelegate()->GetDisplayMode(parent_contents) !=
+          blink::WebDisplayModeStandalone) {
     RecordHttpAuthPromptType(AUTH_PROMPT_TYPE_WITH_INTERSTITIAL);
 
     // Show a blank interstitial for main-frame, cross origin requests
     // so that the correct URL is shown in the omnibox.
     base::Closure callback =
         base::Bind(&LoginHandler::ShowLoginPrompt, request_url,
                    base::RetainedRef(auth_info), base::RetainedRef(handler));
     // The interstitial delegate is owned by the interstitial that it creates.
     // This cancels any existing interstitial.
     handler->SetInterstitialDelegate(
@@ skipping 22 matching lines @@
   bool is_main_frame =
       (request->load_flags() & net::LOAD_MAIN_FRAME_DEPRECATED) != 0;
   LoginHandler* handler = LoginHandler::Create(auth_info, request);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&LoginHandler::LoginDialogCallback, request->url(),
                  base::RetainedRef(auth_info), base::RetainedRef(handler),
                  is_main_frame));
   return handler;
 }