ui/app_list/views/apps_container_view.cc - Issue 687913003: app_list: Moved FolderImageSource into folder_image.cc.

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

Unified Diff: ui/app_list/views/apps_container_view.cc

Issue 687913003: app_list: Moved FolderImageSource into folder_image.cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ares-allapps-icon

Patch Set: Formatting (the ClangFormat rules have changed). Created 6 years, 1 month 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 side-by-side diff with in-line comments

Download patch

Index: ui/app_list/views/apps_container_view.cc

diff --git a/ui/app_list/views/apps_container_view.cc b/ui/app_list/views/apps_container_view.cc

index 52c1051c76707447866d1c92604b4cfb8a725e9a..a53cb60976d033ed8322057c4f8eac0b1bfbde03 100644

--- a/ui/app_list/views/apps_container_view.cc

+++ b/ui/app_list/views/apps_container_view.cc

@@ -11,7 +11,6 @@

#include "ui/app_list/app_list_constants.h"

#include "ui/app_list/app_list_folder_item.h"

#include "ui/app_list/app_list_switches.h"

-#include "ui/app_list/folder_image_source.h"

#include "ui/app_list/views/app_list_folder_view.h"

#include "ui/app_list/views/app_list_item_view.h"

#include "ui/app_list/views/app_list_main_view.h"

@@ -203,7 +202,7 @@ std::vector<gfx::Rect> AppsContainerView::GetTopItemIconBoundsInActiveFolder() {

folder_item_view->GetIconBounds());

gfx::Rect to_container = apps_grid_view_->ConvertRectToParent(to_grid_view);

- return FolderImageSource::GetTopIconsBounds(to_container);

+ return FolderImage::GetTopIconsBounds(to_container);

}

void AppsContainerView::CreateViewsForFolderTopItemsAnimation(

« no previous file with comments | « ui/app_list/folder_image_source.cc ('k') | no next file » | no next file with comments »