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

Side by Side Diff: services/ui/ws/window_server_test_base.h

Issue 2669203002: Revert: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient() (Closed)
Patch Set: 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 | « services/ui/test_wm/test_wm.cc ('k') | services/ui/ws/window_server_test_base.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 SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ 5 #ifndef SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
6 #define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ 6 #define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 10
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 bool OnConnect(const service_manager::Identity& remote_identity, 77 bool OnConnect(const service_manager::Identity& remote_identity,
78 service_manager::InterfaceRegistry* registry) override; 78 service_manager::InterfaceRegistry* registry) override;
79 79
80 // WindowTreeClientDelegate: 80 // WindowTreeClientDelegate:
81 void OnEmbed( 81 void OnEmbed(
82 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; 82 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
83 void OnLostConnection(aura::WindowTreeClient* client) override; 83 void OnLostConnection(aura::WindowTreeClient* client) override;
84 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; 84 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
85 void OnPointerEventObserved(const ui::PointerEvent& event, 85 void OnPointerEventObserved(const ui::PointerEvent& event,
86 aura::Window* target) override; 86 aura::Window* target) override;
87 aura::client::CaptureClient* GetCaptureClient() override;
87 aura::PropertyConverter* GetPropertyConverter() override; 88 aura::PropertyConverter* GetPropertyConverter() override;
88 89
89 // WindowManagerDelegate: 90 // WindowManagerDelegate:
90 void SetWindowManagerClient(aura::WindowManagerClient* client) override; 91 void SetWindowManagerClient(aura::WindowManagerClient* client) override;
91 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; 92 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override;
92 bool OnWmSetProperty( 93 bool OnWmSetProperty(
93 aura::Window* window, 94 aura::Window* window,
94 const std::string& name, 95 const std::string& name,
95 std::unique_ptr<std::vector<uint8_t>>* new_data) override; 96 std::unique_ptr<std::vector<uint8_t>>* new_data) override;
96 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; 97 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 aura::WindowManagerClient* window_manager_client_ = nullptr; 149 aura::WindowManagerClient* window_manager_client_ = nullptr;
149 150
150 bool window_tree_client_lost_connection_ = false; 151 bool window_tree_client_lost_connection_ = false;
151 152
152 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); 153 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase);
153 }; 154 };
154 155
155 } // namespace ui 156 } // namespace ui
156 157
157 #endif // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ 158 #endif // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
OLDNEW
« no previous file with comments | « services/ui/test_wm/test_wm.cc ('k') | services/ui/ws/window_server_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698