| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/app_list/extension_app_item.h" | 5 #include "chrome/browser/ui/app_list/extension_app_item.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/extensions/extension_util.h" | 8 #include "chrome/browser/extensions/extension_util.h" |
| 9 #include "chrome/browser/extensions/launch_util.h" | 9 #include "chrome/browser/extensions/launch_util.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "extensions/common/extension.h" | 22 #include "extensions/common/extension.h" |
| 23 #include "extensions/common/extension_icon_set.h" | 23 #include "extensions/common/extension_icon_set.h" |
| 24 #include "extensions/common/manifest_handlers/icons_handler.h" | 24 #include "extensions/common/manifest_handlers/icons_handler.h" |
| 25 #include "extensions/common/manifest_url_handlers.h" | 25 #include "extensions/common/manifest_url_handlers.h" |
| 26 #include "grit/theme_resources.h" | 26 #include "grit/theme_resources.h" |
| 27 #include "sync/api/string_ordinal.h" | 27 #include "sync/api/string_ordinal.h" |
| 28 #include "ui/base/resource/resource_bundle.h" | 28 #include "ui/base/resource/resource_bundle.h" |
| 29 #include "ui/gfx/canvas.h" | 29 #include "ui/gfx/canvas.h" |
| 30 #include "ui/gfx/color_utils.h" | 30 #include "ui/gfx/color_utils.h" |
| 31 #include "ui/gfx/geometry/rect.h" | 31 #include "ui/gfx/geometry/rect.h" |
| 32 #include "ui/gfx/host_desktop_type.h" |
| 32 #include "ui/gfx/image/canvas_image_source.h" | 33 #include "ui/gfx/image/canvas_image_source.h" |
| 33 #include "ui/gfx/image/image_skia_operations.h" | 34 #include "ui/gfx/image/image_skia_operations.h" |
| 34 | 35 |
| 35 using extensions::Extension; | 36 using extensions::Extension; |
| 36 | 37 |
| 37 namespace { | 38 namespace { |
| 38 | 39 |
| 39 // Overlays a shortcut icon over the bottom left corner of a given image. | 40 // Overlays a shortcut icon over the bottom left corner of a given image. |
| 40 class ShortcutOverlayImageSource : public gfx::CanvasImageSource { | 41 class ShortcutOverlayImageSource : public gfx::CanvasImageSource { |
| 41 public: | 42 public: |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 const syncer::StringOrdinal& launch = | 355 const syncer::StringOrdinal& launch = |
| 355 GetAppSorting(profile_)->GetAppLaunchOrdinal(extension_id_); | 356 GetAppSorting(profile_)->GetAppLaunchOrdinal(extension_id_); |
| 356 set_position(syncer::StringOrdinal( | 357 set_position(syncer::StringOrdinal( |
| 357 page.ToInternalValue() + launch.ToInternalValue())); | 358 page.ToInternalValue() + launch.ToInternalValue())); |
| 358 } | 359 } |
| 359 | 360 |
| 360 AppListControllerDelegate* ExtensionAppItem::GetController() { | 361 AppListControllerDelegate* ExtensionAppItem::GetController() { |
| 361 return AppListService::Get(chrome::GetActiveDesktop())-> | 362 return AppListService::Get(chrome::GetActiveDesktop())-> |
| 362 GetControllerDelegate(); | 363 GetControllerDelegate(); |
| 363 } | 364 } |
| OLD | NEW |