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

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

Issue 2639203007: Update SetPaintToLayer to accept LayerType (Closed)
Patch Set: fix comments Created 3 years, 11 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
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/folder_background_view.h" 5 #include "ui/app_list/views/folder_background_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ui/app_list/app_list_constants.h" 9 #include "ui/app_list/app_list_constants.h"
10 #include "ui/app_list/views/app_list_folder_view.h" 10 #include "ui/app_list/views/app_list_folder_view.h"
11 #include "ui/app_list/views/apps_container_view.h" 11 #include "ui/app_list/views/apps_container_view.h"
12 #include "ui/compositor/scoped_layer_animation_settings.h" 12 #include "ui/compositor/scoped_layer_animation_settings.h"
13 #include "ui/gfx/canvas.h" 13 #include "ui/gfx/canvas.h"
14 #include "ui/gfx/transform_util.h" 14 #include "ui/gfx/transform_util.h"
15 15
16 namespace app_list { 16 namespace app_list {
17 17
18 namespace { 18 namespace {
19 19
20 const float kFolderInkBubbleScale = 1.2f; 20 const float kFolderInkBubbleScale = 1.2f;
21 const int kBubbleTransitionDurationMs = 200; 21 const int kBubbleTransitionDurationMs = 200;
22 22
23 } // namespace 23 } // namespace
24 24
25 FolderBackgroundView::FolderBackgroundView() 25 FolderBackgroundView::FolderBackgroundView()
26 : folder_view_(NULL), 26 : folder_view_(NULL),
27 show_state_(NO_BUBBLE) { 27 show_state_(NO_BUBBLE) {
28 SetPaintToLayer(true); 28 SetPaintToLayer();
29 layer()->SetFillsBoundsOpaquely(false); 29 layer()->SetFillsBoundsOpaquely(false);
30 } 30 }
31 31
32 FolderBackgroundView::~FolderBackgroundView() { 32 FolderBackgroundView::~FolderBackgroundView() {
33 } 33 }
34 34
35 void FolderBackgroundView::UpdateFolderContainerBubble(ShowState state) { 35 void FolderBackgroundView::UpdateFolderContainerBubble(ShowState state) {
36 if (show_state_ == state || 36 if (show_state_ == state ||
37 (state == HIDE_BUBBLE && show_state_ == NO_BUBBLE)) { 37 (state == HIDE_BUBBLE && show_state_ == NO_BUBBLE)) {
38 return; 38 return;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 void FolderBackgroundView::OnImplicitAnimationsCompleted() { 91 void FolderBackgroundView::OnImplicitAnimationsCompleted() {
92 // Show folder name after the ink bubble disappears. 92 // Show folder name after the ink bubble disappears.
93 if (show_state_ == HIDE_BUBBLE) { 93 if (show_state_ == HIDE_BUBBLE) {
94 static_cast<AppsContainerView*>(parent())->app_list_folder_view()-> 94 static_cast<AppsContainerView*>(parent())->app_list_folder_view()->
95 UpdateFolderNameVisibility(true); 95 UpdateFolderNameVisibility(true);
96 } 96 }
97 } 97 }
98 98
99 } // namespace app_list 99 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698