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

Side by Side Diff: ui/app_list/folder_image.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-event: mandol_line Created 5 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 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/folder_image.h" 5 #include "ui/app_list/folder_image.h"
6 6
7 #include <vector> 7 #include <vector>
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/app_list_item.h" 10 #include "ui/app_list/app_list_item.h"
11 #include "ui/app_list/app_list_item_list.h" 11 #include "ui/app_list/app_list_item_list.h"
12 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/gfx/canvas.h" 13 #include "ui/gfx/canvas.h"
14 #include "ui/gfx/geometry/point.h" 14 #include "ui/gfx/geometry/point.h"
15 #include "ui/gfx/geometry/point_f.h"
15 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
16 #include "ui/gfx/geometry/size.h" 17 #include "ui/gfx/geometry/size.h"
17 #include "ui/gfx/image/canvas_image_source.h" 18 #include "ui/gfx/image/canvas_image_source.h"
18 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
19 #include "ui/gfx/image/image_skia_operations.h" 20 #include "ui/gfx/image/image_skia_operations.h"
20 #include "ui/strings/grit/ui_strings.h" 21 #include "ui/strings/grit/ui_strings.h"
21 22
22 namespace app_list { 23 namespace app_list {
23 24
24 namespace { 25 namespace {
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 top_icons.push_back(item->icon()); 219 top_icons.push_back(item->icon());
219 220
220 const gfx::Size icon_size = gfx::Size(kGridIconDimension, kGridIconDimension); 221 const gfx::Size icon_size = gfx::Size(kGridIconDimension, kGridIconDimension);
221 icon_ = 222 icon_ =
222 gfx::ImageSkia(new FolderImageSource(top_icons, icon_size), icon_size); 223 gfx::ImageSkia(new FolderImageSource(top_icons, icon_size), icon_size);
223 224
224 FOR_EACH_OBSERVER(FolderImageObserver, observers_, OnFolderImageUpdated()); 225 FOR_EACH_OBSERVER(FolderImageObserver, observers_, OnFolderImageUpdated());
225 } 226 }
226 227
227 } // namespace app_list 228 } // namespace app_list
OLDNEW
« no previous file with comments | « mojo/converters/input_events/input_events_type_converters.cc ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698