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

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

Issue 1909273003: Makes PhantonWindowController use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@workspace_window_resizer
Patch Set: merge 2 trunk Created 4 years, 8 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/frame/caption_buttons/frame_size_button.cc ('k') | ash/wm/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_WM_AURA_WM_WINDOW_AURA_H_ 5 #ifndef ASH_WM_AURA_WM_WINDOW_AURA_H_
6 #define ASH_WM_AURA_WM_WINDOW_AURA_H_ 6 #define ASH_WM_AURA_WM_WINDOW_AURA_H_
7 7
8 #include "ash/wm/common/wm_window.h" 8 #include "ash/wm/common/wm_window.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 static const aura::Window* GetAuraWindow(const WmWindow* wm_window); 35 static const aura::Window* GetAuraWindow(const WmWindow* wm_window);
36 36
37 aura::Window* aura_window() { return window_; } 37 aura::Window* aura_window() { return window_; }
38 const aura::Window* aura_window() const { return window_; } 38 const aura::Window* aura_window() const { return window_; }
39 39
40 // WmWindow: 40 // WmWindow:
41 const WmWindow* GetRootWindow() const override; 41 const WmWindow* GetRootWindow() const override;
42 WmRootWindowController* GetRootWindowController() override; 42 WmRootWindowController* GetRootWindowController() override;
43 WmGlobals* GetGlobals() const override; 43 WmGlobals* GetGlobals() const override;
44 void SetName(const std::string& name) override;
45 void SetShellWindowId(int id) override;
44 int GetShellWindowId() override; 46 int GetShellWindowId() override;
45 WmWindow* GetChildByShellWindowId(int id) override; 47 WmWindow* GetChildByShellWindowId(int id) override;
46 ui::wm::WindowType GetType() const override; 48 ui::wm::WindowType GetType() const override;
47 ui::Layer* GetLayer() override; 49 ui::Layer* GetLayer() override;
48 gfx::Display GetDisplayNearestWindow() override; 50 gfx::Display GetDisplayNearestWindow() override;
49 bool HasNonClientArea() override; 51 bool HasNonClientArea() override;
50 int GetNonClientComponent(const gfx::Point& location) override; 52 int GetNonClientComponent(const gfx::Point& location) override;
51 gfx::Point ConvertPointToTarget(const WmWindow* target, 53 gfx::Point ConvertPointToTarget(const WmWindow* target,
52 const gfx::Point& point) const override; 54 const gfx::Point& point) const override;
53 gfx::Point ConvertPointToScreen(const gfx::Point& point) const override; 55 gfx::Point ConvertPointToScreen(const gfx::Point& point) const override;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 140
139 base::ObserverList<WmWindowObserver> observers_; 141 base::ObserverList<WmWindowObserver> observers_;
140 142
141 DISALLOW_COPY_AND_ASSIGN(WmWindowAura); 143 DISALLOW_COPY_AND_ASSIGN(WmWindowAura);
142 }; 144 };
143 145
144 } // namespace wm 146 } // namespace wm
145 } // namespace ash 147 } // namespace ash
146 148
147 #endif // ASH_WM_AURA_WM_WINDOW_AURA_H_ 149 #endif // ASH_WM_AURA_WM_WINDOW_AURA_H_
OLDNEW
« no previous file with comments | « ash/frame/caption_buttons/frame_size_button.cc ('k') | ash/wm/aura/wm_window_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698