BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 58 insertions, 0 deletions

diff --git a/chromium/weblayer/browser/infobar_container_android.h b/chromium/weblayer/browser/infobar_container_android.h
new file mode 100644
index 00000000000..4069cf6b19e
--- /dev/null
+++ b/chromium/weblayer/browser/infobar_container_android.h
@@ -0,0 +1,58 @@
+// Copyright 2013 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.
+
+#ifndef WEBLAYER_BROWSER_INFOBAR_CONTAINER_ANDROID_H_
+#define WEBLAYER_BROWSER_INFOBAR_CONTAINER_ANDROID_H_
+
+#include <stddef.h>
+
+#include <map>
+#include <string>
+
+#include "base/android/jni_weak_ref.h"
+#include "base/android/scoped_java_ref.h"
+#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "components/infobars/core/infobar_container.h"
+
+namespace weblayer {
+
+class InfoBarAndroid;
+
+class InfoBarContainerAndroid : public infobars::InfoBarContainer {
+ public:
+  InfoBarContainerAndroid(JNIEnv* env, jobject infobar_container);
+  void SetWebContents(JNIEnv* env,
+                      const base::android::JavaParamRef<jobject>& obj,
+                      const base::android::JavaParamRef<jobject>& web_contents);
+  void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
+
+  JavaObjectWeakGlobalRef java_container() const {
+    return weak_java_infobar_container_;
+  }
+
+ private:
+  ~InfoBarContainerAndroid() override;
+
+  // InfobarContainer:
+  void PlatformSpecificAddInfoBar(infobars::InfoBar* infobar,
+                                  size_t position) override;
+  void PlatformSpecificRemoveInfoBar(infobars::InfoBar* infobar) override;
+  void PlatformSpecificReplaceInfoBar(infobars::InfoBar* old_infobar,
+                                      infobars::InfoBar* new_infobar) override;
+
+  // Create the Java equivalent of |android_bar| and add it to the java
+  // container.
+  void AttachJavaInfoBar(InfoBarAndroid* android_bar);
+
+  // We're owned by the java infobar, need to use a weak ref so it can destroy
+  // us.
+  JavaObjectWeakGlobalRef weak_java_infobar_container_;
+
+  DISALLOW_COPY_AND_ASSIGN(InfoBarContainerAndroid);
+};
+
+}  // namespace weblayer
+
+#endif  // WEBLAYER_BROWSER_INFOBAR_CONTAINER_ANDROID_H_