ui/app_list/views/folder_background_view.cc - Issue 231883003: [stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 231883003: [stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 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

« no previous file with comments | « ui/app_list/views/contents_switcher_view.cc ('k') | ui/app_list/views/progress_bar_view.h » ('j') | no next file with comments »

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