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

Unified Diff: ash/aura/wm_window_aura.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
« no previous file with comments | « no previous file | ash/aura/wm_window_aura.cc » ('j') | ash/common/shelf/shelf_window_watcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_window_aura.h
diff --git a/ash/aura/wm_window_aura.h b/ash/aura/wm_window_aura.h
index 503a60e2fa02eb6aa88cc8701b7eb58c7ad9e8e8..f9fe078686f4eabe3e6bf556a83676bac52058e7 100644
--- a/ash/aura/wm_window_aura.h
+++ b/ash/aura/wm_window_aura.h
@@ -88,6 +88,8 @@ class ASH_EXPORT WmWindowAura : public WmWindow,
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;
« no previous file with comments | « no previous file | ash/aura/wm_window_aura.cc » ('j') | ash/common/shelf/shelf_window_watcher.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698