Disable HTTP Auth dialog while in VR

chrome/browser/ui/android/login_handler_android.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 <memory>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+
+#include "device/vr/features/features.h"
+#if BUILDFLAG(ENABLE_VR)
+#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
+#endif  // BUILDFLAG(ENABLE_VR)
+
 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/auth.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 
 using content::BrowserThread;
 using net::URLRequest;
@@ skipping 22 matching lines @@
                      LoginModelData* login_model_data) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     // Get pointer to TabAndroid
     content::WebContents* web_contents = GetWebContentsForLogin();
     CHECK(web_contents);
     ViewAndroidHelper* view_helper = ViewAndroidHelper::FromWebContents(
         web_contents);
 
     // Notify WindowAndroid that HTTP authentication is required.
-    if (view_helper->GetViewAndroid()
-        && view_helper->GetViewAndroid()->GetWindowAndroid()) {
+    if (view_helper->GetViewAndroid() &&
+        view_helper->GetViewAndroid()->GetWindowAndroid()
+#if BUILDFLAG(ENABLE_VR)

[Ted C, 2017/05/24 17:40:44]

just for readability, I'd be tempted to pull this out and above this condition

#if BUILDFLAG(ENABLE_VR)
  if (!vr_shell::VrTabHelper::IsInVr(web_contents)) {
    CancelAuth();
    return;
  }
#endif

Then you don't have the ifdef in the else below that scares me (where it looks
too easy to add something and with the lack of braces see it not get called)

[billorr, 2017/05/24 18:00:42]

Done.

+        && !vr_shell::VrTabHelper::IsInVr(web_contents)
+#endif
+            ) {
       chrome_http_auth_handler_.reset(
           new ChromeHttpAuthHandler(authority, explanation));
       chrome_http_auth_handler_->Init();
       chrome_http_auth_handler_->SetObserver(this);
       chrome_http_auth_handler_->ShowDialog(
           view_helper->GetViewAndroid()
           ->GetWindowAndroid()->GetJavaObject().obj());
 
       if (login_model_data)
         SetModel(*login_model_data);
       else
         ResetModel();
 
       NotifyAuthNeeded();
     } else {
       CancelAuth();
-      LOG(WARNING) << "HTTP Authentication failed because TabAndroid is "
-          "missing";
+#if BUILDFLAG(ENABLE_VR)
+      // Only LOG(WARNING) if we aren't in VR
+      if (!vr_shell::VrTabHelper::IsInVr(web_contents))
+#endif
+        LOG(WARNING) << "HTTP Authentication failed because TabAndroid is "
+                        "missing";
     }
   }
 
  protected:
   ~LoginHandlerAndroid() override {}
 
   void CloseDialog() override {}
 
  private:
   std::unique_ptr<ChromeHttpAuthHandler> chrome_http_auth_handler_;
 };
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
                                    net::URLRequest* request) {
   return new LoginHandlerAndroid(auth_info, request);
 }