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

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

Issue 788493002: app_list: Enable level 1 of cpplint, be stricker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert PRESUBMIT.py changes Created 6 years 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
« no previous file with comments | « ui/app_list/views/contents_animator.h ('k') | ui/app_list/views/search_result_list_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
8
7 #include "ui/app_list/app_list_constants.h" 9 #include "ui/app_list/app_list_constants.h"
8 #include "ui/app_list/views/app_list_folder_view.h" 10 #include "ui/app_list/views/app_list_folder_view.h"
9 #include "ui/app_list/views/apps_container_view.h" 11 #include "ui/app_list/views/apps_container_view.h"
10 #include "ui/compositor/scoped_layer_animation_settings.h" 12 #include "ui/compositor/scoped_layer_animation_settings.h"
11 #include "ui/gfx/canvas.h" 13 #include "ui/gfx/canvas.h"
12 #include "ui/gfx/transform_util.h" 14 #include "ui/gfx/transform_util.h"
13 15
14 namespace app_list { 16 namespace app_list {
15 17
16 namespace { 18 namespace {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 90
89 void FolderBackgroundView::OnImplicitAnimationsCompleted() { 91 void FolderBackgroundView::OnImplicitAnimationsCompleted() {
90 // Show folder name after the ink bubble disappears. 92 // Show folder name after the ink bubble disappears.
91 if (show_state_ == HIDE_BUBBLE) { 93 if (show_state_ == HIDE_BUBBLE) {
92 static_cast<AppsContainerView*>(parent())->app_list_folder_view()-> 94 static_cast<AppsContainerView*>(parent())->app_list_folder_view()->
93 UpdateFolderNameVisibility(true); 95 UpdateFolderNameVisibility(true);
94 } 96 }
95 } 97 }
96 98
97 } // namespace app_list 99 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/contents_animator.h ('k') | ui/app_list/views/search_result_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698