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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window.h

Issue 2900783003: Handle app custom icon via aura::Window property. (Closed)
Patch Set: more comments Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/arc_app_window.h
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window.h b/chrome/browser/ui/ash/launcher/arc_app_window.h
index ffef2ba06042266456663ed3bb8d31909d5d26b7..7b2b0d2661d65a8306017c4063a22d2d5a226ee3 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_window.h
+++ b/chrome/browser/ui/ash/launcher/arc_app_window.h
@@ -13,7 +13,6 @@
#include "chrome/browser/image_decoder.h"
#include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
#include "ui/base/base_window.h"
-#include "ui/gfx/image/image_skia.h"
class ArcAppWindowLauncherController;
class ArcAppWindowLauncherItemController;
@@ -63,8 +62,6 @@ class ArcAppWindow : public ui::BaseWindow, public ImageDecoder::ImageRequest {
ArcAppWindowLauncherItemController* controller() { return controller_; }
- const gfx::ImageSkia& icon() const { return icon_; }
-
// ui::BaseWindow:
bool IsActive() const override;
bool IsMaximized() const override;
@@ -103,8 +100,6 @@ class ArcAppWindow : public ui::BaseWindow, public ImageDecoder::ImageRequest {
ash::ShelfID shelf_id_;
// Keeps current full-screen mode.
FullScreenMode fullscreen_mode_ = FullScreenMode::NOT_DEFINED;
- // Contains custom icon if it was set.
- gfx::ImageSkia icon_;
// Unowned pointers
views::Widget* const widget_;
ArcAppWindowLauncherController* const owner_;

Powered by Google App Engine
This is Rietveld 408576698