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

Unified Diff: ui/aura/test/aura_test_base.h

Issue 2470963002: Makes it possible for clients to directly create WindowTreeHostMus (Closed)
Patch Set: nuke comment Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/mus/window_tree_host_mus_delegate.h ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_base.h
diff --git a/ui/aura/test/aura_test_base.h b/ui/aura/test/aura_test_base.h
index a76aa170ad55e28da77c0f53610d7652ad72309c..ed8c86e6d407d922cfa104071e11f08d1dacd6e8 100644
--- a/ui/aura/test/aura_test_base.h
+++ b/ui/aura/test/aura_test_base.h
@@ -87,7 +87,7 @@ class AuraTestBase : public testing::Test,
void SetPropertyConverter(std::unique_ptr<PropertyConverter> helper);
// WindowTreeClientDelegate:
- void OnEmbed(Window* root) override;
+ void OnEmbed(std::unique_ptr<WindowTreeHostMus> window_tree_host) override;
void OnUnembed(Window* root) override;
void OnEmbedRootDestroyed(Window* root) override;
void OnLostConnection(WindowTreeClient* client) override;
@@ -105,7 +105,8 @@ class AuraTestBase : public testing::Test,
std::map<std::string, std::vector<uint8_t>>* properties) override;
void OnWmClientJankinessChanged(const std::set<Window*>& client_windows,
bool janky) override;
- void OnWmNewDisplay(Window* window, const display::Display& display) override;
+ void OnWmNewDisplay(std::unique_ptr<WindowTreeHostMus> window_tree_host,
+ const display::Display& display) override;
void OnWmDisplayRemoved(Window* window) override;
void OnWmDisplayModified(const display::Display& display) override;
ui::mojom::EventResult OnAccelerator(uint32_t id,
« no previous file with comments | « ui/aura/mus/window_tree_host_mus_delegate.h ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698