Chromium Code Reviews| 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..1a70f5ee7c5a82174ace096ac200dab131aea2f4 100644 |
| --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc |
| +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
| @@ -529,6 +529,7 @@ void LocationBarView::UpdateContentSettingsIcons() { |
| RefreshContentSettingViews(); |
| Layout(); |
| + UpdatePostLayout(); |
| SchedulePaint(); |
| } |
| @@ -1137,7 +1138,15 @@ int LocationBarView::GetHorizontalEdgeThickness() const { |
| void LocationBarView::RefreshContentSettingViews() { |
|
Peter Kasting
2013/09/03 23:50:43
I realize you said that only one place can make th
npentrel
2013/09/04 09:55:36
In the other place where RefreshCOntentSettingView
npentrel
2013/09/04 11:27:31
Never mind, it is called. I added the call to Upda
|
| 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() { |
|
Peter Kasting
2013/09/03 23:50:43
I think calling this UpdatePostLayout() is somewha
npentrel
2013/09/04 09:55:36
Done.
|
| + for (ContentSettingViews::const_iterator i(content_setting_views_.begin()); |
| + i != content_setting_views_.end(); ++i) { |
| + (*i)->UpdatePostLayout(GetToolbarModel()->input_in_progress() ? |
| NULL : GetWebContents()); |
| } |
| } |