Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: ui/app_list/views/top_icon_animation_view.cc

Issue 466293002: Hardcode applist icon dimension and shadows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/kPreferredIconDimension/kGridIconDimension/g, move header Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/app_list/views/top_icon_animation_view.h" 5 #include "ui/app_list/views/top_icon_animation_view.h"
6 6
7 #include "base/message_loop/message_loop_proxy.h" 7 #include "base/message_loop/message_loop_proxy.h"
8 #include "ui/app_list/app_list_constants.h" 8 #include "ui/app_list/app_list_constants.h"
9 #include "ui/compositor/scoped_layer_animation_settings.h" 9 #include "ui/compositor/scoped_layer_animation_settings.h"
10 #include "ui/gfx/image/image_skia_operations.h" 10 #include "ui/gfx/image/image_skia_operations.h"
11 #include "ui/views/controls/image_view.h" 11 #include "ui/views/controls/image_view.h"
12 12
13 namespace app_list { 13 namespace app_list {
14 14
15 TopIconAnimationView::TopIconAnimationView(const gfx::ImageSkia& icon, 15 TopIconAnimationView::TopIconAnimationView(const gfx::ImageSkia& icon,
16 const gfx::Rect& scaled_rect, 16 const gfx::Rect& scaled_rect,
17 bool open_folder) 17 bool open_folder)
18 : icon_size_(kPreferredIconDimension, kPreferredIconDimension), 18 : icon_size_(kGridIconDimension, kGridIconDimension),
19 icon_(new views::ImageView), 19 icon_(new views::ImageView),
20 scaled_rect_(scaled_rect), 20 scaled_rect_(scaled_rect),
21 open_folder_(open_folder) { 21 open_folder_(open_folder) {
22 DCHECK(!icon.isNull()); 22 DCHECK(!icon.isNull());
23 gfx::ImageSkia resized(gfx::ImageSkiaOperations::CreateResizedImage( 23 gfx::ImageSkia resized(gfx::ImageSkiaOperations::CreateResizedImage(
24 icon, 24 icon,
25 skia::ImageOperations::RESIZE_BEST, icon_size_)); 25 skia::ImageOperations::RESIZE_BEST, icon_size_));
26 icon_->SetImage(resized); 26 icon_->SetImage(resized);
27 AddChildView(icon_); 27 AddChildView(icon_);
28 28
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 observers_, 85 observers_,
86 OnTopIconAnimationsComplete()); 86 OnTopIconAnimationsComplete());
87 base::MessageLoopProxy::current()->DeleteSoon(FROM_HERE, this); 87 base::MessageLoopProxy::current()->DeleteSoon(FROM_HERE, this);
88 } 88 }
89 89
90 bool TopIconAnimationView::RequiresNotificationWhenAnimatorDestroyed() const { 90 bool TopIconAnimationView::RequiresNotificationWhenAnimatorDestroyed() const {
91 return true; 91 return true;
92 } 92 }
93 93
94 } // namespace app_list 94 } // namespace app_list
OLDNEW
« ui/app_list/views/app_list_item_view.cc ('K') | « ui/app_list/views/apps_grid_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698