diff options
author | erikchen <erikchen@chromium.org> | 2015-01-05 11:36:58 -0800 |
---|---|---|
committer | erikchen <erikchen@chromium.org> | 2015-01-05 19:40:01 +0000 |
commit | 04cd2c55f94db80e59bdd4f03edcc266d5c2b9ef (patch) | |
tree | da6d9911fc67e55e949e404787e53fab6608d2fa /chrome/browser/chrome_device_client.cc | |
parent | 80eb4da34bfebe361dd4b2c296a295490bea1b53 (diff) | |
download | chromium_src-04cd2c55f94db80e59bdd4f03edcc266d5c2b9ef.zip chromium_src-04cd2c55f94db80e59bdd4f03edcc266d5c2b9ef.tar.gz chromium_src-04cd2c55f94db80e59bdd4f03edcc266d5c2b9ef.tar.bz2 |
Merge "Fix disappearing page actions bug." to 2214.
> Fix disappearing page actions bug.
>
> The logic in LocationBarViewMac implicitly relied on the assumption that there
> is a 1:1 correspondence between |page_actions_| and |page_action_decorations_|.
> The implementation of DeletePageActionDecorations() cleared one vector but not
> the other, breaking this implicit assumption and causing the bug. This CL
> removes |page_actions_|, as the information is already contained within
> |page_action_decorations_|, which fixes the bug.
>
> The same was true for LocationBarView, modulo some minor renaming of members
> and methods. There was a second bug in LocationBarView, where
> InvalidatePageActions() deleted the page actions instead of refreshing them.
>
> The documentation for InvalidatePageActions() and UpdatePageActions() implied
> that the two methods were called at different times, and should have different
> effects. Looking at the call sites, UpdatePageActions() was being called in
> places where the documentation implied InvalidatePageActions() should be
> called. This CL deletes InvalidatePageActions().
>
> BUG=173055
> TBR=jcivelli@chromium.org
>
> Review URL: https://codereview.chromium.org/789763004
>
> Cr-Commit-Position: refs/heads/master@{#309797}
(cherry picked from commit 545918a1b072eed5e15f28c772c682f9167b6677)
BUG=173055
TBR=jcivelli@chromium.org, danduong@chromium.org, rsesek@chromium.org, pkasting@chromium.org, wittman@chromium.org
Review URL: https://codereview.chromium.org/833203002
Cr-Commit-Position: refs/branch-heads/2214@{#380}
Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
Diffstat (limited to 'chrome/browser/chrome_device_client.cc')
0 files changed, 0 insertions, 0 deletions