diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 16:26:02 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 16:26:02 +0000 |
| commit | 25e9e1e7ae20fdf1a25ae32ca6828586f97899ed (patch) | |
| tree | 75b1fa890f1b01c49ddad90a6a6c3818f14e194c /ui/app_list | |
| parent | 14f154a965b9776b560d088a0df984fa168c50cb (diff) | |
| download | chromium_src-25e9e1e7ae20fdf1a25ae32ca6828586f97899ed.zip chromium_src-25e9e1e7ae20fdf1a25ae32ca6828586f97899ed.tar.gz chromium_src-25e9e1e7ae20fdf1a25ae32ca6828586f97899ed.tar.bz2 | |
Removes dependency of window_util on views
To do this I promoted RecreateLayer to LayerOwner. To make
RecreateWindowLayers a bit less error prone it returns a scoper that
owns the layer and all its descendants.
Also nuked the set_bounds param passed to RecreateWindowLayers as it
was always true.
Made View::RecreateLayer and Window::RecreateLayer consistent in so
far as they both set the bounds now. Previously Window didn't, but
because we passed in true everywhere we used RecreateLayer I can make
that change.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/189723006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list')
| -rw-r--r-- | ui/app_list/views/apps_grid_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index f5c1adc..1ef7a73 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -1171,7 +1171,7 @@ void AppsGridView::AnimationBetweenRows(views::View* view, #if defined(USE_AURA) scoped_ptr<ui::Layer> layer; if (animate_current) { - layer.reset(view->RecreateLayer()); + layer = view->RecreateLayer(); layer->SuppressPaint(); view->SetFillsBoundsOpaquely(false); |