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

Unified Diff: ash/mus/bridge/wm_window_mus.h

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)
Patch Set: Add ShelfWindowWatcherTest, remove ChromeLauncherControllerImplTest panel use. Created 4 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: ash/mus/bridge/wm_window_mus.h
diff --git a/ash/mus/bridge/wm_window_mus.h b/ash/mus/bridge/wm_window_mus.h
index 2b2d2251043d7e7a4c86dea2a18f1551615fb4e4..7e9c96a12c67815d65d565512d531f34096a8411 100644
--- a/ash/mus/bridge/wm_window_mus.h
+++ b/ash/mus/bridge/wm_window_mus.h
@@ -152,6 +152,8 @@ class WmWindowMus : public WmWindow, public ui::WindowObserver {
void SetColorProperty(WmWindowProperty key, SkColor value) override;
int GetIntProperty(WmWindowProperty key) override;
void SetIntProperty(WmWindowProperty key, int value) override;
+ gfx::ImageSkia GetWindowIcon() override;
+ gfx::ImageSkia GetAppIcon() override;
const wm::WindowState* GetWindowState() const override;
WmWindow* GetToplevelWindow() override;
WmWindow* GetToplevelWindowForFocus() override;

Powered by Google App Engine
This is Rietveld 408576698