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

Side by Side Diff: ash/common/wm_window.h

Issue 2192553002: mash: Convert ShelfWindowWatcher to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits and better test Created 4 years, 4 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 | « ash/aura/wm_window_aura.cc ('k') | ash/common/wm_window_property.h » ('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_COMMON_WM_WINDOW_H_ 5 #ifndef ASH_COMMON_WM_WINDOW_H_
6 #define ASH_COMMON_WM_WINDOW_H_ 6 #define ASH_COMMON_WM_WINDOW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 21 matching lines...) Expand all
32 class Layer; 32 class Layer;
33 } 33 }
34 34
35 namespace views { 35 namespace views {
36 class View; 36 class View;
37 class Widget; 37 class Widget;
38 } 38 }
39 39
40 namespace ash { 40 namespace ash {
41 41
42 struct ShelfItemDetails;
42 class WmLayoutManager; 43 class WmLayoutManager;
43 class WmRootWindowController; 44 class WmRootWindowController;
44 class WmShell; 45 class WmShell;
45 class WmWindowObserver; 46 class WmWindowObserver;
46 enum class WmWindowProperty; 47 enum class WmWindowProperty;
47 48
48 namespace wm { 49 namespace wm {
49 class WindowState; 50 class WindowState;
50 } 51 }
51 52
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 virtual void SetOpacity(float opacity) = 0; 113 virtual void SetOpacity(float opacity) = 0;
113 virtual float GetTargetOpacity() const = 0; 114 virtual float GetTargetOpacity() const = 0;
114 115
115 virtual void SetTransform(const gfx::Transform& transform) = 0; 116 virtual void SetTransform(const gfx::Transform& transform) = 0;
116 virtual gfx::Transform GetTargetTransform() const = 0; 117 virtual gfx::Transform GetTargetTransform() const = 0;
117 118
118 virtual bool IsSystemModal() const = 0; 119 virtual bool IsSystemModal() const = 0;
119 120
120 virtual bool GetBoolProperty(WmWindowProperty key) = 0; 121 virtual bool GetBoolProperty(WmWindowProperty key) = 0;
121 virtual int GetIntProperty(WmWindowProperty key) = 0; 122 virtual int GetIntProperty(WmWindowProperty key) = 0;
123 virtual void SetIntProperty(WmWindowProperty key, int value) = 0;
124
125 // Returns null if there are no details.
126 virtual ShelfItemDetails* GetShelfItemDetails() = 0;
122 127
123 wm::WindowState* GetWindowState() { 128 wm::WindowState* GetWindowState() {
124 return const_cast<wm::WindowState*>( 129 return const_cast<wm::WindowState*>(
125 const_cast<const WmWindow*>(this)->GetWindowState()); 130 const_cast<const WmWindow*>(this)->GetWindowState());
126 } 131 }
127 virtual const wm::WindowState* GetWindowState() const = 0; 132 virtual const wm::WindowState* GetWindowState() const = 0;
128 133
129 // The implementation of this matches aura::Window::GetToplevelWindow(). 134 // The implementation of this matches aura::Window::GetToplevelWindow().
130 virtual WmWindow* GetToplevelWindow() = 0; 135 virtual WmWindow* GetToplevelWindow() = 0;
131 // The implementation of this matches 136 // The implementation of this matches
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 virtual void AddLimitedPreTargetHandler(ui::EventHandler* handler) = 0; 296 virtual void AddLimitedPreTargetHandler(ui::EventHandler* handler) = 0;
292 virtual void RemoveLimitedPreTargetHandler(ui::EventHandler* handler) = 0; 297 virtual void RemoveLimitedPreTargetHandler(ui::EventHandler* handler) = 0;
293 298
294 protected: 299 protected:
295 virtual ~WmWindow() {} 300 virtual ~WmWindow() {}
296 }; 301 };
297 302
298 } // namespace ash 303 } // namespace ash
299 304
300 #endif // ASH_COMMON_WM_WINDOW_H_ 305 #endif // ASH_COMMON_WM_WINDOW_H_
OLDNEW
« no previous file with comments | « ash/aura/wm_window_aura.cc ('k') | ash/common/wm_window_property.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698