Index: chrome/browser/ui/views/location_bar/location_bar_view.cc |
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
index 4b2dbd2e88f0ae63b660051489ca93acfe3f9197..ad108470b8e271dc9c5c4b4a8cbd01d0f54b3ba7 100644 |
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc |
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
@@ -523,12 +523,14 @@ void LocationBarView::Update(const WebContents* contents) { |
location_entry_->Update(); |
OnChanged(); |
+ UpdatePostLayout(); |
} |
void LocationBarView::UpdateContentSettingsIcons() { |
RefreshContentSettingViews(); |
Layout(); |
+ UpdatePostLayout(); |
SchedulePaint(); |
} |
@@ -1137,7 +1139,15 @@ int LocationBarView::GetHorizontalEdgeThickness() const { |
void LocationBarView::RefreshContentSettingViews() { |
Peter Kasting
2013/09/04 20:59:11
Nit: Why don't e name these functions UpdateConten
npentrel
2013/09/04 21:50:18
Done.
|
for (ContentSettingViews::const_iterator i(content_setting_views_.begin()); |
i != content_setting_views_.end(); ++i) { |
- (*i)->Update(GetToolbarModel()->input_in_progress() ? |
+ (*i)->UpdatePreLayout(GetToolbarModel()->input_in_progress() ? |
+ NULL : GetWebContents()); |
+ } |
+} |
+ |
+void LocationBarView::UpdatePostLayout() { |
+ for (ContentSettingViews::const_iterator i(content_setting_views_.begin()); |
+ i != content_setting_views_.end(); ++i) { |
+ (*i)->UpdatePostLayout(GetToolbarModel()->input_in_progress() ? |
NULL : GetWebContents()); |
} |
} |