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

Side by Side Diff: ash/aura/wm_window_aura.h

Issue 2357143004: mash: Support ShelfWindowWatcher via ShelfItem properties. (Closed)
Patch Set: Address comments. Created 4 years, 2 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
« no previous file with comments | « no previous file | ash/aura/wm_window_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef ASH_AURA_WM_WINDOW_AURA_H_ 5 #ifndef ASH_AURA_WM_WINDOW_AURA_H_
6 #define ASH_AURA_WM_WINDOW_AURA_H_ 6 #define ASH_AURA_WM_WINDOW_AURA_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/wm_window.h" 9 #include "ash/common/wm_window.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 aura::Window* aura_window() { return window_; } 45 aura::Window* aura_window() { return window_; }
46 const aura::Window* aura_window() const { return window_; } 46 const aura::Window* aura_window() const { return window_; }
47 47
48 // WmWindow: 48 // WmWindow:
49 void Destroy() override; 49 void Destroy() override;
50 const WmWindow* GetRootWindow() const override; 50 const WmWindow* GetRootWindow() const override;
51 WmRootWindowController* GetRootWindowController() override; 51 WmRootWindowController* GetRootWindowController() override;
52 WmShell* GetShell() const override; 52 WmShell* GetShell() const override;
53 void SetName(const char* name) override; 53 void SetName(const char* name) override;
54 std::string GetName() const override; 54 std::string GetName() const override;
55 void SetTitle(const base::string16& title) override;
55 base::string16 GetTitle() const override; 56 base::string16 GetTitle() const override;
56 void SetShellWindowId(int id) override; 57 void SetShellWindowId(int id) override;
57 int GetShellWindowId() const override; 58 int GetShellWindowId() const override;
58 WmWindow* GetChildByShellWindowId(int id) override; 59 WmWindow* GetChildByShellWindowId(int id) override;
59 ui::wm::WindowType GetType() const override; 60 ui::wm::WindowType GetType() const override;
60 bool IsBubble() override; 61 bool IsBubble() override;
61 ui::Layer* GetLayer() override; 62 ui::Layer* GetLayer() override;
62 display::Display GetDisplayNearestWindow() override; 63 display::Display GetDisplayNearestWindow() override;
63 bool HasNonClientArea() override; 64 bool HasNonClientArea() override;
64 int GetNonClientComponent(const gfx::Point& location) override; 65 int GetNonClientComponent(const gfx::Point& location) override;
(...skipping 11 matching lines...) Expand all
76 float GetTargetOpacity() const override; 77 float GetTargetOpacity() const override;
77 gfx::Rect GetMinimizeAnimationTargetBoundsInScreen() const override; 78 gfx::Rect GetMinimizeAnimationTargetBoundsInScreen() const override;
78 void SetTransform(const gfx::Transform& transform) override; 79 void SetTransform(const gfx::Transform& transform) override;
79 gfx::Transform GetTargetTransform() const override; 80 gfx::Transform GetTargetTransform() const override;
80 bool IsSystemModal() const override; 81 bool IsSystemModal() const override;
81 bool GetBoolProperty(WmWindowProperty key) override; 82 bool GetBoolProperty(WmWindowProperty key) override;
82 SkColor GetColorProperty(WmWindowProperty key) override; 83 SkColor GetColorProperty(WmWindowProperty key) override;
83 void SetColorProperty(WmWindowProperty key, SkColor value) override; 84 void SetColorProperty(WmWindowProperty key, SkColor value) override;
84 int GetIntProperty(WmWindowProperty key) override; 85 int GetIntProperty(WmWindowProperty key) override;
85 void SetIntProperty(WmWindowProperty key, int value) override; 86 void SetIntProperty(WmWindowProperty key, int value) override;
86 ShelfItemDetails* GetShelfItemDetails() override;
87 void SetShelfItemDetails(const ShelfItemDetails& details) override;
88 void ClearShelfItemDetails() override;
89 const wm::WindowState* GetWindowState() const override; 87 const wm::WindowState* GetWindowState() const override;
90 WmWindow* GetToplevelWindow() override; 88 WmWindow* GetToplevelWindow() override;
91 WmWindow* GetToplevelWindowForFocus() override; 89 WmWindow* GetToplevelWindowForFocus() override;
92 void SetParentUsingContext(WmWindow* context, 90 void SetParentUsingContext(WmWindow* context,
93 const gfx::Rect& screen_bounds) override; 91 const gfx::Rect& screen_bounds) override;
94 void AddChild(WmWindow* window) override; 92 void AddChild(WmWindow* window) override;
95 void RemoveChild(WmWindow* child) override; 93 void RemoveChild(WmWindow* child) override;
96 const WmWindow* GetParent() const override; 94 const WmWindow* GetParent() const override;
97 const WmWindow* GetTransientParent() const override; 95 const WmWindow* GetTransientParent() const override;
98 std::vector<WmWindow*> GetTransientChildren() override; 96 std::vector<WmWindow*> GetTransientChildren() override;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 206
209 bool added_transient_observer_ = false; 207 bool added_transient_observer_ = false;
210 base::ObserverList<WmTransientWindowObserver> transient_observers_; 208 base::ObserverList<WmTransientWindowObserver> transient_observers_;
211 209
212 DISALLOW_COPY_AND_ASSIGN(WmWindowAura); 210 DISALLOW_COPY_AND_ASSIGN(WmWindowAura);
213 }; 211 };
214 212
215 } // namespace ash 213 } // namespace ash
216 214
217 #endif // ASH_AURA_WM_WINDOW_AURA_H_ 215 #endif // ASH_AURA_WM_WINDOW_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_window_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698