BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 18 insertions, 7 deletions

diff --git a/chromium/components/tab_groups/tab_group_visual_data.cc b/chromium/components/tab_groups/tab_group_visual_data.cc
index 92e952e3bb4..8ef0a7f2742 100644
--- a/chromium/components/tab_groups/tab_group_visual_data.cc
+++ b/chromium/components/tab_groups/tab_group_visual_data.cc
@@ -12,14 +12,19 @@
 namespace tab_groups {
 
 TabGroupVisualData::TabGroupVisualData()
-    : TabGroupVisualData(base::string16(), TabGroupColorId::kGrey) {}
+    : TabGroupVisualData(base::string16(), TabGroupColorId::kGrey, false) {}
 
 TabGroupVisualData::TabGroupVisualData(base::string16 title,
-                                       tab_groups::TabGroupColorId color)
-    : title_(std::move(title)), color_(color) {}
+                                       tab_groups::TabGroupColorId color,
+                                       bool is_collapsed)
+    : title_(std::move(title)), color_(color), is_collapsed_(is_collapsed) {}
 
-TabGroupVisualData::TabGroupVisualData(base::string16 title, uint32_t color_int)
-    : title_(std::move(title)), color_(TabGroupColorId::kGrey) {
+TabGroupVisualData::TabGroupVisualData(base::string16 title,
+                                       uint32_t color_int,
+                                       bool is_collapsed)
+    : title_(std::move(title)),
+      color_(TabGroupColorId::kGrey),
+      is_collapsed_(is_collapsed) {
   auto color_id = static_cast<tab_groups::TabGroupColorId>(color_int);
   if (base::Contains(tab_groups::GetTabGroupColorLabelMap(), color_id))
     color_ = color_id;
diff --git a/chromium/components/tab_groups/tab_group_visual_data.h b/chromium/components/tab_groups/tab_group_visual_data.h
index 7509bc5c323..2bd5f0fb90a 100644
--- a/chromium/components/tab_groups/tab_group_visual_data.h
+++ b/chromium/components/tab_groups/tab_group_visual_data.h
@@ -19,8 +19,12 @@ class COMPONENT_EXPORT(TAB_GROUPS) TabGroupVisualData {
  public:
   // Construct a TabGroupVisualData with placeholder name and random color.
   TabGroupVisualData();
-  TabGroupVisualData(base::string16 title, tab_groups::TabGroupColorId color);
-  TabGroupVisualData(base::string16 title, uint32_t color_int);
+  TabGroupVisualData(base::string16 title,
+                     tab_groups::TabGroupColorId color,
+                     bool is_collapsed = false);
+  TabGroupVisualData(base::string16 title,
+                     uint32_t color_int,
+                     bool is_collapsed = false);
 
   TabGroupVisualData(const TabGroupVisualData& other) = default;
   TabGroupVisualData(TabGroupVisualData&& other) = default;
@@ -30,6 +34,7 @@ class COMPONENT_EXPORT(TAB_GROUPS) TabGroupVisualData {
 
   const base::string16& title() const { return title_; }
   const tab_groups::TabGroupColorId& color() const { return color_; }
+  bool is_collapsed() const { return is_collapsed_; }
 
   // Checks whether two instances are visually equivalent.
   bool operator==(const TabGroupVisualData& other) const {
@@ -42,6 +47,7 @@ class COMPONENT_EXPORT(TAB_GROUPS) TabGroupVisualData {
  private:
   base::string16 title_;
   tab_groups::TabGroupColorId color_;
+  bool is_collapsed_;
 };
 
 }  // namespace tab_groups