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

Side by Side Diff: ui/aura/window_tree_host.h

Issue 2565563003: Revert of Making WTH::InitCompositor() protected instead of public. (Closed)
Patch Set: Created 4 years 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 | « mash/simple_wm/simple_wm.cc ('k') | ui/aura/window_tree_host.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_AURA_WINDOW_TREE_HOST_H_ 5 #ifndef UI_AURA_WINDOW_TREE_HOST_H_
6 #define UI_AURA_WINDOW_TREE_HOST_H_ 6 #define UI_AURA_WINDOW_TREE_HOST_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 // Creates a new WindowTreeHost. The caller owns the returned value. 54 // Creates a new WindowTreeHost. The caller owns the returned value.
55 static WindowTreeHost* Create(const gfx::Rect& bounds_in_pixels); 55 static WindowTreeHost* Create(const gfx::Rect& bounds_in_pixels);
56 56
57 // Returns the WindowTreeHost for the specified accelerated widget, or NULL 57 // Returns the WindowTreeHost for the specified accelerated widget, or NULL
58 // if there is none associated. 58 // if there is none associated.
59 static WindowTreeHost* GetForAcceleratedWidget(gfx::AcceleratedWidget widget); 59 static WindowTreeHost* GetForAcceleratedWidget(gfx::AcceleratedWidget widget);
60 60
61 void InitHost(); 61 void InitHost();
62 62
63 void InitCompositor();
64
63 void AddObserver(WindowTreeHostObserver* observer); 65 void AddObserver(WindowTreeHostObserver* observer);
64 void RemoveObserver(WindowTreeHostObserver* observer); 66 void RemoveObserver(WindowTreeHostObserver* observer);
65 67
66 Window* window() { return window_; } 68 Window* window() { return window_; }
67 const Window* window() const { return window_; } 69 const Window* window() const { return window_; }
68 70
69 ui::EventProcessor* event_processor(); 71 ui::EventProcessor* event_processor();
70 72
71 WindowEventDispatcher* dispatcher() { 73 WindowEventDispatcher* dispatcher() {
72 return const_cast<WindowEventDispatcher*>( 74 return const_cast<WindowEventDispatcher*>(
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 protected: 186 protected:
185 friend class TestScreen; // TODO(beng): see if we can remove/consolidate. 187 friend class TestScreen; // TODO(beng): see if we can remove/consolidate.
186 188
187 WindowTreeHost(); 189 WindowTreeHost();
188 explicit WindowTreeHost(std::unique_ptr<WindowPort> window_port); 190 explicit WindowTreeHost(std::unique_ptr<WindowPort> window_port);
189 191
190 void DestroyCompositor(); 192 void DestroyCompositor();
191 void DestroyDispatcher(); 193 void DestroyDispatcher();
192 194
193 void CreateCompositor(); 195 void CreateCompositor();
194 void InitCompositor();
195 void OnAcceleratedWidgetAvailable(); 196 void OnAcceleratedWidgetAvailable();
196 197
197 // Returns the location of the RootWindow on native screen. 198 // Returns the location of the RootWindow on native screen.
198 virtual gfx::Point GetLocationOnScreenInPixels() const = 0; 199 virtual gfx::Point GetLocationOnScreenInPixels() const = 0;
199 200
200 void OnHostMovedInPixels(const gfx::Point& new_location_in_pixels); 201 void OnHostMovedInPixels(const gfx::Point& new_location_in_pixels);
201 void OnHostResizedInPixels(const gfx::Size& new_size_in_pixels); 202 void OnHostResizedInPixels(const gfx::Size& new_size_in_pixels);
202 void OnHostWorkspaceChanged(); 203 void OnHostWorkspaceChanged();
203 void OnHostCloseRequested(); 204 void OnHostCloseRequested();
204 void OnHostActivated(); 205 void OnHostActivated();
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 bool owned_input_method_; 261 bool owned_input_method_;
261 262
262 gfx::Insets output_surface_padding_in_pixels_; 263 gfx::Insets output_surface_padding_in_pixels_;
263 264
264 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost); 265 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
265 }; 266 };
266 267
267 } // namespace aura 268 } // namespace aura
268 269
269 #endif // UI_AURA_WINDOW_TREE_HOST_H_ 270 #endif // UI_AURA_WINDOW_TREE_HOST_H_
OLDNEW
« no previous file with comments | « mash/simple_wm/simple_wm.cc ('k') | ui/aura/window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698