Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2295)

Unified Diff: chrome/browser/ui/android/ssl_client_certificate_request.cc

Issue 2975593002: [vr] Deny permission requests in VR mode
Patch Set: . Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/android/ssl_client_certificate_request.cc
diff --git a/chrome/browser/ui/android/ssl_client_certificate_request.cc b/chrome/browser/ui/android/ssl_client_certificate_request.cc
index 3d9a25e03d71ff1685b5953aa4d5551af2cf4a08..6d4de7debd820a2b6f10444144662ddf94ffa79f 100644
--- a/chrome/browser/ui/android/ssl_client_certificate_request.cc
+++ b/chrome/browser/ui/android/ssl_client_certificate_request.cc
@@ -16,6 +16,7 @@
#include "base/memory/ref_counted.h"
#include "chrome/browser/ssl/ssl_client_certificate_selector.h"
#include "chrome/browser/ui/android/view_android_helper.h"
+#include "chrome/browser/vr/vr_tab_helper.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/client_certificate_delegate.h"
#include "device/vr/features/features.h"
@@ -30,10 +31,6 @@
#include "ui/android/view_android.h"
#include "ui/android/window_android.h"
-#if BUILDFLAG(ENABLE_VR)
-#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
-#endif // BUILDFLAG(ENABLE_VR)
-
using base::android::JavaParamRef;
using base::android::ScopedJavaLocalRef;
@@ -193,12 +190,11 @@ void ShowSSLClientCertificateSelector(
net::SSLCertRequestInfo* cert_request_info,
net::ClientCertIdentityList unused_client_certs,
std::unique_ptr<content::ClientCertificateDelegate> delegate) {
-#if BUILDFLAG(ENABLE_VR)
- if (vr_shell::VrTabHelper::IsInVr(contents)) {
+ if (vr::VrTabHelper::IsInVr(contents)) {
delegate->ContinueWithCertificate(nullptr, nullptr);
return;
}
-#endif // BUILDFLAG(ENABLE_VR)
+
ui::WindowAndroid* window = ViewAndroidHelper::FromWebContents(contents)
->GetViewAndroid()->GetWindowAndroid();
DCHECK(window);
« no previous file with comments | « chrome/browser/ui/android/login_handler_android.cc ('k') | chrome/browser/ui/android/usb_chooser_dialog_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698