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

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

Issue 2759643003: Add system modals to the proper container in mus+ash. (Closed)
Patch Set: addressed feedback. Created 3 years, 9 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
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 aura::Window* target) override; 86 aura::Window* target) override;
87 aura::PropertyConverter* GetPropertyConverter() override; 87 aura::PropertyConverter* GetPropertyConverter() override;
88 88
89 // WindowManagerDelegate: 89 // WindowManagerDelegate:
90 void SetWindowManagerClient(aura::WindowManagerClient* client) override; 90 void SetWindowManagerClient(aura::WindowManagerClient* client) override;
91 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; 91 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override;
92 bool OnWmSetProperty( 92 bool OnWmSetProperty(
93 aura::Window* window, 93 aura::Window* window,
94 const std::string& name, 94 const std::string& name,
95 std::unique_ptr<std::vector<uint8_t>>* new_data) override; 95 std::unique_ptr<std::vector<uint8_t>>* new_data) override;
96 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override;
96 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; 97 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override;
97 aura::Window* OnWmCreateTopLevelWindow( 98 aura::Window* OnWmCreateTopLevelWindow(
98 ui::mojom::WindowType window_type, 99 ui::mojom::WindowType window_type,
99 std::map<std::string, std::vector<uint8_t>>* properties) override; 100 std::map<std::string, std::vector<uint8_t>>* properties) override;
100 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, 101 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows,
101 bool not_responding) override; 102 bool not_responding) override;
102 void OnWmWillCreateDisplay(const display::Display& display) override; 103 void OnWmWillCreateDisplay(const display::Display& display) override;
103 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, 104 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
104 const display::Display& display) override; 105 const display::Display& display) override;
105 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override; 106 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override;
(...skipping 42 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/ws/window_manager_client_unittest.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