Index: chrome/browser/ui/android/tab_model/tab_model_selector_base.cc |
diff --git a/chrome/browser/ui/android/tab_model/tab_model_selector_base.cc b/chrome/browser/ui/android/tab_model/tab_model_selector_base.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..a6478db8e9a453f6d3618b54457aa6a2ca918f18 |
--- /dev/null |
+++ b/chrome/browser/ui/android/tab_model/tab_model_selector_base.cc |
@@ -0,0 +1,43 @@ |
+// Copyright 2016 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/android/tab_model/tab_model_selector_base.h" |
+ |
+#include "base/android/jni_android.h" |
+#include "chrome/browser/android/tab_android.h" |
+#include "chrome/browser/permissions/permission_request_manager.h" |
+#include "content/public/browser/web_contents.h" |
+#include "jni/TabModelSelectorBase_jni.h" |
+ |
+using base::android::JavaParamRef; |
+ |
+static void OnActiveTabChanged( |
+ JNIEnv* env, |
+ const JavaParamRef<jclass>& clazz, |
+ const JavaParamRef<jobject>& java_old_web_contents, |
+ const JavaParamRef<jobject>& java_new_web_contents) { |
+ // Check if PermissionRequestManager is reused on Android to manage infobars. |
+ // This is currently behind a switch flag. |
+ if (PermissionRequestManager::IsEnabled()) { |
Bernhard Bauer
2016/11/24 15:30:40
Return early if it's disabled?
lshang
2016/11/25 00:41:06
Done.
|
+ content::WebContents* old_contents = |
+ content::WebContents::FromJavaWebContents(java_old_web_contents); |
+ content::WebContents* new_contents = |
+ content::WebContents::FromJavaWebContents(java_new_web_contents); |
+ DCHECK(new_contents); |
+ |
+ if (old_contents && PermissionRequestManager::FromWebContents(old_contents)) |
+ PermissionRequestManager::FromWebContents(old_contents)->HideBubble(); |
Bernhard Bauer
2016/11/24 15:30:40
When is the PermissionRequestManager null?
lshang
2016/11/25 00:41:06
I guess https://cs.chromium.org/chromium/src/chrom
Bernhard Bauer
2016/11/25 09:52:24
Please don't try to avoid crashes "just in case";
|
+ |
+ if (new_contents && |
+ PermissionRequestManager::FromWebContents(new_contents)) { |
+ PermissionRequestManager::FromWebContents(new_contents) |
+ ->DisplayPendingRequests(); |
+ } |
+ } |
+} |
+ |
+// Register native methods |
+bool RegisterTabModelSelectorBase(JNIEnv* env) { |
+ return RegisterNativesImpl(env); |
+} |