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

Side by Side Diff: chrome/browser/ui/app_list/extension_app_item.cc

Issue 2067943004: ARC: Add badge for Chrome hosted Apps if Arc++ is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address xiyuan@'s comment. Rebase Created 4 years, 6 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
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 15 matching lines...) Expand all
26 #include "extensions/common/manifest_handlers/icons_handler.h" 26 #include "extensions/common/manifest_handlers/icons_handler.h"
27 #include "extensions/common/manifest_url_handlers.h" 27 #include "extensions/common/manifest_url_handlers.h"
28 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "sync/api/string_ordinal.h" 29 #include "sync/api/string_ordinal.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 #include "ui/events/event_constants.h" 31 #include "ui/events/event_constants.h"
32 #include "ui/gfx/canvas.h" 32 #include "ui/gfx/canvas.h"
33 #include "ui/gfx/geometry/rect.h" 33 #include "ui/gfx/geometry/rect.h"
34 #include "ui/gfx/image/canvas_image_source.h" 34 #include "ui/gfx/image/canvas_image_source.h"
35 35
36 #if defined(OS_CHROMEOS)
37 #include "chrome/browser/chromeos/extensions/gfx_utils.h"
38 #endif
39
36 using extensions::Extension; 40 using extensions::Extension;
37 41
38 namespace { 42 namespace {
39 43
40 // Overlays a shortcut icon over the bottom left corner of a given image. 44 // Overlays a shortcut icon over the bottom left corner of a given image.
41 class ShortcutOverlayImageSource : public gfx::CanvasImageSource { 45 class ShortcutOverlayImageSource : public gfx::CanvasImageSource {
42 public: 46 public:
43 explicit ShortcutOverlayImageSource(const gfx::ImageSkia& icon) 47 explicit ShortcutOverlayImageSource(const gfx::ImageSkia& icon)
44 : gfx::CanvasImageSource(icon.size(), false), 48 : gfx::CanvasImageSource(icon.size(), false),
45 icon_(icon) { 49 icon_(icon) {
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 166
163 void ExtensionAppItem::UpdateIcon() { 167 void ExtensionAppItem::UpdateIcon() {
164 gfx::ImageSkia icon = installing_icon_; 168 gfx::ImageSkia icon = installing_icon_;
165 169
166 // Use the app icon if the app exists. Turn the image greyscale if the app is 170 // Use the app icon if the app exists. Turn the image greyscale if the app is
167 // not launchable. 171 // not launchable.
168 if (GetExtension() && icon_) { 172 if (GetExtension() && icon_) {
169 icon = icon_->image_skia(); 173 icon = icon_->image_skia();
170 const bool enabled = extensions::util::IsAppLaunchable(extension_id(), 174 const bool enabled = extensions::util::IsAppLaunchable(extension_id(),
171 profile()); 175 profile());
176 #if defined(OS_CHROMEOS)
177 extensions::util::MaybeApplyChromeBadge(profile(), id(), &icon);
178 #endif
179
172 if (!enabled) 180 if (!enabled)
173 icon = CreateDisabledIcon(icon); 181 icon = CreateDisabledIcon(icon);
174 182
175 if (GetExtension()->from_bookmark()) 183 if (GetExtension()->from_bookmark())
176 icon = gfx::ImageSkia(new RoundedCornersImageSource(icon), icon.size()); 184 icon = gfx::ImageSkia(new RoundedCornersImageSource(icon), icon.size());
177 } 185 }
178 // Paint the shortcut overlay if necessary. 186 // Paint the shortcut overlay if necessary.
179 has_overlay_ = NeedsOverlay(); 187 has_overlay_ = NeedsOverlay();
180 if (has_overlay_) 188 if (has_overlay_)
181 icon = gfx::ImageSkia(new ShortcutOverlayImageSource(icon), icon.size()); 189 icon = gfx::ImageSkia(new ShortcutOverlayImageSource(icon), icon.size());
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 } 349 }
342 350
343 void ExtensionAppItem::UpdatePositionFromOrdering() { 351 void ExtensionAppItem::UpdatePositionFromOrdering() {
344 const syncer::StringOrdinal& page = 352 const syncer::StringOrdinal& page =
345 GetAppSorting()->GetPageOrdinal(extension_id()); 353 GetAppSorting()->GetPageOrdinal(extension_id());
346 const syncer::StringOrdinal& launch = 354 const syncer::StringOrdinal& launch =
347 GetAppSorting()->GetAppLaunchOrdinal(extension_id()); 355 GetAppSorting()->GetAppLaunchOrdinal(extension_id());
348 set_position(syncer::StringOrdinal( 356 set_position(syncer::StringOrdinal(
349 page.ToInternalValue() + launch.ToInternalValue())); 357 page.ToInternalValue() + launch.ToInternalValue()));
350 } 358 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_app_icon_loader.cc ('k') | chrome/browser/ui/app_list/extension_app_model_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698