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

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

Issue 2536943005: Adds couple of functions to WindowManagerDelegate: (Closed)
Patch Set: comment 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 | « ui/aura/mus/window_tree_client.cc ('k') | ui/aura/test/aura_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 (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 "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override; 97 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override;
98 bool OnWmSetProperty( 98 bool OnWmSetProperty(
99 Window* window, 99 Window* window,
100 const std::string& name, 100 const std::string& name,
101 std::unique_ptr<std::vector<uint8_t>>* new_data) override; 101 std::unique_ptr<std::vector<uint8_t>>* new_data) override;
102 Window* OnWmCreateTopLevelWindow( 102 Window* OnWmCreateTopLevelWindow(
103 ui::mojom::WindowType window_type, 103 ui::mojom::WindowType window_type,
104 std::map<std::string, std::vector<uint8_t>>* properties) override; 104 std::map<std::string, std::vector<uint8_t>>* properties) override;
105 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, 105 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows,
106 bool janky) override; 106 bool janky) override;
107 void OnWmWillCreateDisplay(const display::Display& display) override;
107 void OnWmNewDisplay(std::unique_ptr<WindowTreeHostMus> window_tree_host, 108 void OnWmNewDisplay(std::unique_ptr<WindowTreeHostMus> window_tree_host,
108 const display::Display& display) override; 109 const display::Display& display) override;
109 void OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) override; 110 void OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) override;
110 void OnWmDisplayModified(const display::Display& display) override; 111 void OnWmDisplayModified(const display::Display& display) override;
111 ui::mojom::EventResult OnAccelerator(uint32_t id, 112 ui::mojom::EventResult OnAccelerator(uint32_t id,
112 const ui::Event& event) override; 113 const ui::Event& event) override;
113 void OnWmPerformMoveLoop(Window* window, 114 void OnWmPerformMoveLoop(Window* window,
114 ui::mojom::MoveLoopSource source, 115 ui::mojom::MoveLoopSource source,
115 const gfx::Point& cursor_location, 116 const gfx::Point& cursor_location,
116 const base::Callback<void(bool)>& on_done) override; 117 const base::Callback<void(bool)>& on_done) override;
117 void OnWmCancelMoveLoop(Window* window) override; 118 void OnWmCancelMoveLoop(Window* window) override;
119 void OnWmSetClientArea(
120 Window* window,
121 const gfx::Insets& insets,
122 const std::vector<gfx::Rect>& additional_client_areas) override;
118 client::CaptureClient* GetCaptureClient() override; 123 client::CaptureClient* GetCaptureClient() override;
119 PropertyConverter* GetPropertyConverter() override; 124 PropertyConverter* GetPropertyConverter() override;
120 125
121 private: 126 private:
122 // Only used for mus. Both are are initialized to this, but may be reset. 127 // Only used for mus. Both are are initialized to this, but may be reset.
123 WindowManagerDelegate* window_manager_delegate_; 128 WindowManagerDelegate* window_manager_delegate_;
124 WindowTreeClientDelegate* window_tree_client_delegate_; 129 WindowTreeClientDelegate* window_tree_client_delegate_;
125 130
126 bool use_mus_ = false; 131 bool use_mus_ = false;
127 bool setup_called_ = false; 132 bool setup_called_ = false;
(...skipping 19 matching lines...) Expand all
147 private: 152 private:
148 bool setup_called_ = false; 153 bool setup_called_ = false;
149 154
150 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType); 155 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType);
151 }; 156 };
152 157
153 } // namespace test 158 } // namespace test
154 } // namespace aura 159 } // namespace aura
155 160
156 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ 161 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698