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

Side by Side Diff: ui/aura/test/aura_test_base.h

Issue 2745143004: Inform window manager about modal windows in mus+ash. (Closed)
Patch Set: . 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 (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_TEST_AURA_TEST_BASE_H_ 5 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void OnPointerEventObserved(const ui::PointerEvent& event, 95 void OnPointerEventObserved(const ui::PointerEvent& event,
96 Window* target) override; 96 Window* target) override;
97 97
98 // WindowManagerDelegate: 98 // WindowManagerDelegate:
99 void SetWindowManagerClient(WindowManagerClient* client) override; 99 void SetWindowManagerClient(WindowManagerClient* client) override;
100 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override; 100 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override;
101 bool OnWmSetProperty( 101 bool OnWmSetProperty(
102 Window* window, 102 Window* window,
103 const std::string& name, 103 const std::string& name,
104 std::unique_ptr<std::vector<uint8_t>>* new_data) override; 104 std::unique_ptr<std::vector<uint8_t>>* new_data) override;
105 bool OnWmSetModalType(aura::Window* window, ui::ModalType type) override;
105 void OnWmSetCanFocus(Window* window, bool can_focus) override; 106 void OnWmSetCanFocus(Window* window, bool can_focus) override;
106 Window* OnWmCreateTopLevelWindow( 107 Window* OnWmCreateTopLevelWindow(
107 ui::mojom::WindowType window_type, 108 ui::mojom::WindowType window_type,
108 std::map<std::string, std::vector<uint8_t>>* properties) override; 109 std::map<std::string, std::vector<uint8_t>>* properties) override;
109 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, 110 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows,
110 bool janky) override; 111 bool janky) override;
111 void OnWmWillCreateDisplay(const display::Display& display) override; 112 void OnWmWillCreateDisplay(const display::Display& display) override;
112 void OnWmNewDisplay(std::unique_ptr<WindowTreeHostMus> window_tree_host, 113 void OnWmNewDisplay(std::unique_ptr<WindowTreeHostMus> window_tree_host,
113 const display::Display& display) override; 114 const display::Display& display) override;
114 void OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) override; 115 void OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) override;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 void SetUp() override; 170 void SetUp() override;
170 171
171 private: 172 private:
172 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseMus); 173 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseMus);
173 }; 174 };
174 175
175 } // namespace test 176 } // namespace test
176 } // namespace aura 177 } // namespace aura
177 178
178 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ 179 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698