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

Side by Side Diff: ash/mus/window_manager.h

Issue 2657873006: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient(). (Closed)
Patch Set: rebase Created 3 years, 10 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/mus/window_manager.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MUS_WINDOW_MANAGER_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_
6 #define ASH_MUS_WINDOW_MANAGER_H_ 6 #define ASH_MUS_WINDOW_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 RootWindowController* GetPrimaryRootWindowController(); 126 RootWindowController* GetPrimaryRootWindowController();
127 127
128 // WindowTreeClientDelegate: 128 // WindowTreeClientDelegate:
129 void OnEmbed( 129 void OnEmbed(
130 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; 130 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
131 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; 131 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
132 void OnLostConnection(aura::WindowTreeClient* client) override; 132 void OnLostConnection(aura::WindowTreeClient* client) override;
133 void OnPointerEventObserved(const ui::PointerEvent& event, 133 void OnPointerEventObserved(const ui::PointerEvent& event,
134 aura::Window* target) override; 134 aura::Window* target) override;
135 aura::client::CaptureClient* GetCaptureClient() override;
136 aura::PropertyConverter* GetPropertyConverter() override; 135 aura::PropertyConverter* GetPropertyConverter() override;
137 136
138 // WindowManagerDelegate: 137 // WindowManagerDelegate:
139 void SetWindowManagerClient(aura::WindowManagerClient* client) override; 138 void SetWindowManagerClient(aura::WindowManagerClient* client) override;
140 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; 139 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override;
141 bool OnWmSetProperty( 140 bool OnWmSetProperty(
142 aura::Window* window, 141 aura::Window* window,
143 const std::string& name, 142 const std::string& name,
144 std::unique_ptr<std::vector<uint8_t>>* new_data) override; 143 std::unique_ptr<std::vector<uint8_t>>* new_data) override;
145 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; 144 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // create the various test delegates rather than a member. 201 // create the various test delegates rather than a member.
203 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_for_test_; 202 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_for_test_;
204 203
205 DISALLOW_COPY_AND_ASSIGN(WindowManager); 204 DISALLOW_COPY_AND_ASSIGN(WindowManager);
206 }; 205 };
207 206
208 } // namespace mus 207 } // namespace mus
209 } // namespace ash 208 } // namespace ash
210 209
211 #endif // ASH_MUS_WINDOW_MANAGER_H_ 210 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698