diff options
| author | Evan Stade <estade@chromium.org> | 2016-03-21 13:23:46 -0700 |
|---|---|---|
| committer | Evan Stade <estade@chromium.org> | 2016-03-21 20:26:50 +0000 |
| commit | 1d99db566e1d5b5e4807aaa991fd8d7de18ff4ac (patch) | |
| tree | f4b52b92490fc6f4d55ab93164323d55b2e990fd | |
| parent | 33194f6ef8dc786de45c3995361c3036be540451 (diff) | |
| download | chromium_src-1d99db566e1d5b5e4807aaa991fd8d7de18ff4ac.zip chromium_src-1d99db566e1d5b5e4807aaa991fd8d7de18ff4ac.tar.gz chromium_src-1d99db566e1d5b5e4807aaa991fd8d7de18ff4ac.tar.bz2 | |
[MD] Fix bookmark bar button overflow during bar animation.
BUG=595167
Review URL: https://codereview.chromium.org/1804343002
Cr-Commit-Position: refs/heads/master@{#381528}
(cherry picked from commit 394208b1512d343f32bd9ddd606d9abae88be906)
Review URL: https://codereview.chromium.org/1820793003 .
Cr-Commit-Position: refs/branch-heads/2661@{#327}
Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081}
| -rw-r--r-- | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index a7b0350..b642a9b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -616,6 +616,13 @@ BookmarkBarView::BookmarkBarView(Browser* browser, BrowserView* browser_view) set_id(VIEW_ID_BOOKMARK_BAR); Init(); + if (ui::MaterialDesignController::IsModeMaterial()) { + // Don't let the bookmarks show on top of the location bar while animating. + SetPaintToLayer(true); + layer()->SetFillsBoundsOpaquely(false); + layer()->SetMasksToBounds(true); + } + size_animation_.Reset(1); } |