Avoid a race condition in the Origin Info Bubble UI.

chrome/browser/ui/views/website_settings/website_settings_popup_view.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/views/website_settings/website_settings_popup_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 456 matching lines @@
     width = std::max(width, permissions_content_->GetPreferredSize().width());
   if (header_)
     width = std::max(width, header_->GetPreferredNameWidth());
   width += kPermissionsSectionPaddingLeft + kPermissionsSectionPaddingRight;
   width = std::min(width, kMaxPopupWidth);
   return gfx::Size(width, height);
 }
 
 void WebsiteSettingsPopupView::SetCookieInfo(
     const CookieInfoList& cookie_info_list) {
-  site_data_content_->RemoveAllChildViews(true);
-
-  views::GridLayout* layout = new views::GridLayout(site_data_content_);
-  site_data_content_->SetLayoutManager(layout);
-
-  const int site_data_content_column = 0;
-  views::ColumnSet* column_set =
-      layout->AddColumnSet(site_data_content_column);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::FIXED,
-                        kSiteDataIconColumnWidth,
-                        0);
-  column_set->AddPaddingColumn(0, kIconMarginLeft);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::USE_PREF,
-                        0,
-                        0);
-  // No padding. This third column is for |third_party_label_text| (see below),
-  // and the text needs to flow naturally from the |first_party_label_text|
-  // link.
-  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
-                        views::GridLayout::USE_PREF, 0, 0);
-
-  layout->AddPaddingRow(1, 5);
-
   // |cookie_info_list| should only ever have 2 items: first- and third-party
   // cookies.
   DCHECK_EQ(cookie_info_list.size(), 2u);
   base::string16 first_party_label_text;
   base::string16 third_party_label_text;
   for (const auto& i : cookie_info_list) {
     if (i.is_first_party) {
       first_party_label_text =
           l10n_util::GetStringFUTF16(IDS_WEBSITE_SETTINGS_FIRST_PARTY_SITE_DATA,
                                      base::IntToString16(i.allowed));
     } else {
       third_party_label_text =
           l10n_util::GetStringFUTF16(IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA,
                                      base::IntToString16(i.allowed));
     }
   }
 
-  cookie_dialog_link_ = new views::Link(first_party_label_text);
-  cookie_dialog_link_->set_listener(this);
+  if (!cookie_dialog_link_) {
+    cookie_dialog_link_ = new views::Link(first_party_label_text);
+    cookie_dialog_link_->set_listener(this);
+  } else {
+    cookie_dialog_link_->SetText(first_party_label_text);

[felt, 2015/09/28 20:47:40]

So this has the effect of updating the text, even without building a new layout?
And then layout->Layout(site_data_content) tells it to refresh with the new
text?

[palmer, 2015/09/28 21:02:51]

That's right. Previously, we blew away all the child views,

    site_data_content_->RemoveAllChildViews(true);

and rebuilt all the child views and their layout, from scratch, every time.
(Sounds kind of slow, doesn't it!) All that, just to update the text of the link
(or, previously, the text labels). But with cookie_dialog_link_->SetText, we can
keep everything and just update the text. And then:
Yep.

+  }
 
-  layout->StartRow(1, site_data_content_column);
-  WebsiteSettingsUI::PermissionInfo info;
-  info.type = CONTENT_SETTINGS_TYPE_COOKIES;
-  info.setting = CONTENT_SETTING_ALLOW;
-  views::ImageView* icon = new views::ImageView();
-  const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(info);
-  icon->SetImage(image.ToImageSkia());
-  layout->AddView(icon, 1, 1, views::GridLayout::CENTER,
-                  views::GridLayout::CENTER);
-  layout->AddView(cookie_dialog_link_, 1, 1, views::GridLayout::CENTER,
-                  views::GridLayout::CENTER);
-  base::string16 comma = base::ASCIIToUTF16(", ");
+  views::GridLayout* layout =
+      static_cast<views::GridLayout*>(site_data_content_->GetLayoutManager());
+  if (!layout) {
+    layout = new views::GridLayout(site_data_content_);
+    site_data_content_->SetLayoutManager(layout);
 
-  layout->AddView(new views::Label(comma + third_party_label_text), 1, 1,
-                  views::GridLayout::LEADING, views::GridLayout::CENTER);
+    const int site_data_content_column = 0;
+    views::ColumnSet* column_set =
+        layout->AddColumnSet(site_data_content_column);
+    column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                          views::GridLayout::FIXED, kSiteDataIconColumnWidth,
+                          0);
+    column_set->AddPaddingColumn(0, kIconMarginLeft);
+    column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                          views::GridLayout::USE_PREF, 0, 0);
+    // No padding. This third column is for |third_party_label_text| (see
+    // below),
+    // and the text needs to flow naturally from the |first_party_label_text|
+    // link.
+    column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                          views::GridLayout::USE_PREF, 0, 0);
 
-  layout->AddPaddingRow(1, 6);
+    layout->AddPaddingRow(1, 5);
+
+    layout->StartRow(1, site_data_content_column);
+    WebsiteSettingsUI::PermissionInfo info;
+    info.type = CONTENT_SETTINGS_TYPE_COOKIES;
+    info.setting = CONTENT_SETTING_ALLOW;
+    views::ImageView* icon = new views::ImageView();
+    const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(info);
+    icon->SetImage(image.ToImageSkia());
+    layout->AddView(icon, 1, 1, views::GridLayout::CENTER,
+                    views::GridLayout::CENTER);
+    layout->AddView(cookie_dialog_link_, 1, 1, views::GridLayout::CENTER,
+                    views::GridLayout::CENTER);
+    base::string16 comma = base::ASCIIToUTF16(", ");
+
+    layout->AddView(new views::Label(comma + third_party_label_text), 1, 1,
+                    views::GridLayout::LEADING, views::GridLayout::CENTER);
+
+    layout->AddPaddingRow(1, 6);
+  }
 
   layout->Layout(site_data_content_);
   SizeToContents();
 }
 
 void WebsiteSettingsPopupView::SetPermissionInfo(
     const PermissionInfoList& permission_info_list) {
   // When a permission is changed, WebsiteSettings::OnSitePermissionChanged()
   // calls this method with updated permissions. However, PermissionSelectorView
   // will have already updated its state, so it's already reflected in the UI.
@@ skipping 308 matching lines @@
     // desktop we should link to that here, too.
     web_contents_->OpenURL(content::OpenURLParams(
         GURL(chrome::kChromeUIContentSettingsURL), content::Referrer(),
         NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false));
     presenter_->RecordWebsiteSettingsAction(
         WebsiteSettings::WEBSITE_SETTINGS_SITE_SETTINGS_OPENED);
   } else {
     NOTREACHED();
   }
 }