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

Unified Diff: ash/aura/wm_window_aura.cc

Issue 2243513004: mash: Partially migrate WorkspaceController to ash common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: ash/aura/wm_window_aura.cc
diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
index ade4df575c47c6ac9b2af1a214dae310d35992cf..a46b56f50adc35e58407d139afa7ee42ab5f1221 100644
--- a/ash/aura/wm_window_aura.cc
+++ b/ash/aura/wm_window_aura.cc
@@ -355,12 +355,14 @@ void WmWindowAura::SetLayoutManager(
std::unique_ptr<WmLayoutManager> layout_manager) {
// |window_| takes ownership of AuraLayoutManagerAdapter.
window_->SetLayoutManager(
- new AuraLayoutManagerAdapter(std::move(layout_manager)));
+ layout_manager ? new AuraLayoutManagerAdapter(std::move(layout_manager))
+ : nullptr);
}
WmLayoutManager* WmWindowAura::GetLayoutManager() {
- return static_cast<AuraLayoutManagerAdapter*>(window_->layout_manager())
- ->wm_layout_manager();
+ AuraLayoutManagerAdapter* adapter =
+ static_cast<AuraLayoutManagerAdapter*>(window_->layout_manager());
+ return adapter ? adapter->wm_layout_manager() : nullptr;
}
void WmWindowAura::SetVisibilityAnimationType(int type) {

Powered by Google App Engine
This is Rietveld 408576698