OLD | NEW |
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 "ui/app_list/app_list_constants.h" | 7 #include "ui/app_list/app_list_constants.h" |
8 #include "ui/app_list/views/app_list_folder_view.h" | 8 #include "ui/app_list/views/app_list_folder_view.h" |
9 #include "ui/app_list/views/apps_container_view.h" | 9 #include "ui/app_list/views/apps_container_view.h" |
10 #include "ui/compositor/scoped_layer_animation_settings.h" | 10 #include "ui/compositor/scoped_layer_animation_settings.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 paint.setAntiAlias(true); | 81 paint.setAntiAlias(true); |
82 paint.setColor(kFolderBubbleColor); | 82 paint.setColor(kFolderBubbleColor); |
83 canvas->DrawCircle(GetContentsBounds().CenterPoint(), | 83 canvas->DrawCircle(GetContentsBounds().CenterPoint(), |
84 GetFolderContainerBubbleRadius(), | 84 GetFolderContainerBubbleRadius(), |
85 paint); | 85 paint); |
86 } | 86 } |
87 | 87 |
88 void FolderBackgroundView::OnImplicitAnimationsCompleted() { | 88 void FolderBackgroundView::OnImplicitAnimationsCompleted() { |
89 // Show folder name after the ink bubble disappears. | 89 // Show folder name after the ink bubble disappears. |
90 if (show_state_ == HIDE_BUBBLE) { | 90 if (show_state_ == HIDE_BUBBLE) { |
| 91 #ifdef FIXME |
91 static_cast<AppsContainerView*>(parent())->app_list_folder_view()-> | 92 static_cast<AppsContainerView*>(parent())->app_list_folder_view()-> |
92 UpdateFolderNameVisibility(true); | 93 UpdateFolderNameVisibility(true); |
| 94 #endif |
93 } | 95 } |
94 } | 96 } |
95 | 97 |
96 } // namespace app_list | 98 } // namespace app_list |
OLD | NEW |