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

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

Issue 2480713003: Window prerequisites for ShelfWindowWatcher panel support. (Closed)
Patch Set: Support and test pre-widget exo ShellSurface::SetApplicationId. 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 | « ash/common/wm_window_property.h ('k') | ash/mus/bridge/wm_window_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3331a3e10064b6994c150d1c55f916fef1eda16b 100644
--- a/ash/mus/bridge/wm_window_mus.h
+++ b/ash/mus/bridge/wm_window_mus.h
@@ -152,6 +152,11 @@ 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;
+ std::string GetStringProperty(WmWindowProperty key) override;
+ void SetStringProperty(WmWindowProperty key,
+ const std::string& value) override;
+ gfx::ImageSkia GetWindowIcon() override;
+ gfx::ImageSkia GetAppIcon() override;
const wm::WindowState* GetWindowState() const override;
WmWindow* GetToplevelWindow() override;
WmWindow* GetToplevelWindowForFocus() override;
@@ -162,6 +167,7 @@ class WmWindowMus : public WmWindow, public ui::WindowObserver {
const WmWindow* GetParent() const override;
const WmWindow* GetTransientParent() const override;
std::vector<WmWindow*> GetTransientChildren() override;
+ bool MoveToEventRoot(const ui::Event& event) override;
void SetLayoutManager(
std::unique_ptr<WmLayoutManager> layout_manager) override;
WmLayoutManager* GetLayoutManager() override;
« no previous file with comments | « ash/common/wm_window_property.h ('k') | ash/mus/bridge/wm_window_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698