OLD | NEW |
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 29 matching lines...) Expand all Loading... |
40 static const aura::Window* GetAuraWindow(const WmWindow* wm_window); | 40 static const aura::Window* GetAuraWindow(const WmWindow* wm_window); |
41 | 41 |
42 aura::Window* aura_window() { return window_; } | 42 aura::Window* aura_window() { return window_; } |
43 const aura::Window* aura_window() const { return window_; } | 43 const aura::Window* aura_window() const { return window_; } |
44 | 44 |
45 // WmWindow: | 45 // WmWindow: |
46 const WmWindow* GetRootWindow() const override; | 46 const WmWindow* GetRootWindow() const override; |
47 WmRootWindowController* GetRootWindowController() override; | 47 WmRootWindowController* GetRootWindowController() override; |
48 WmShell* GetShell() const override; | 48 WmShell* GetShell() const override; |
49 void SetName(const char* name) override; | 49 void SetName(const char* name) override; |
| 50 std::string GetName() const override; |
50 base::string16 GetTitle() const override; | 51 base::string16 GetTitle() const override; |
51 void SetShellWindowId(int id) override; | 52 void SetShellWindowId(int id) override; |
52 int GetShellWindowId() const override; | 53 int GetShellWindowId() const override; |
53 WmWindow* GetChildByShellWindowId(int id) override; | 54 WmWindow* GetChildByShellWindowId(int id) override; |
54 ui::wm::WindowType GetType() const override; | 55 ui::wm::WindowType GetType() const override; |
55 ui::Layer* GetLayer() override; | 56 ui::Layer* GetLayer() override; |
56 display::Display GetDisplayNearestWindow() override; | 57 display::Display GetDisplayNearestWindow() override; |
57 bool HasNonClientArea() override; | 58 bool HasNonClientArea() override; |
58 int GetNonClientComponent(const gfx::Point& location) override; | 59 int GetNonClientComponent(const gfx::Point& location) override; |
59 gfx::Point ConvertPointToTarget(const WmWindow* target, | 60 gfx::Point ConvertPointToTarget(const WmWindow* target, |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 aura::Window* window_; | 176 aura::Window* window_; |
176 | 177 |
177 base::ObserverList<WmWindowObserver> observers_; | 178 base::ObserverList<WmWindowObserver> observers_; |
178 | 179 |
179 DISALLOW_COPY_AND_ASSIGN(WmWindowAura); | 180 DISALLOW_COPY_AND_ASSIGN(WmWindowAura); |
180 }; | 181 }; |
181 | 182 |
182 } // namespace ash | 183 } // namespace ash |
183 | 184 |
184 #endif // ASH_AURA_WM_WINDOW_AURA_H_ | 185 #endif // ASH_AURA_WM_WINDOW_AURA_H_ |
OLD | NEW |