Skip to content

Instantly share code, notes, and snippets.

@tiagovignatti
Created October 14, 2013 14:22
Show Gist options
  • Save tiagovignatti/6976450 to your computer and use it in GitHub Desktop.
Save tiagovignatti/6976450 to your computer and use it in GitHub Desktop.
commit 0a7b787286722ae0b50a358000d6031eeff7ba34
Author: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Mon Oct 14 17:19:07 2013 +0300
Revert "Track upstream changes."
This reverts commit 14c1f41dcc7704f9de58bf9bd9c634c51e31a517.
---
impl/desktop_root_window_host_wayland.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/impl/desktop_root_window_host_wayland.cc b/impl/desktop_root_window_host_wayland.cc
index 5137dd6..55ec60b 100644
--- a/impl/desktop_root_window_host_wayland.cc
+++ b/impl/desktop_root_window_host_wayland.cc
@@ -20,6 +20,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
#include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
+#include "ui/views/widget/desktop_aura/desktop_layout_manager.h"
#include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
#include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
@@ -95,6 +96,7 @@ aura::RootWindow* DesktopRootWindowHostWayland::InitRootWindow(
root_window_ = new aura::RootWindow(rw_params);
root_window_->Init();
root_window_->AddChild(content_window_);
+ root_window_->SetLayoutManager(new DesktopLayoutManager(root_window_));
root_window_->SetProperty(kViewsWindowForRootWindow, content_window_);
root_window_->SetProperty(kHostForRootWindow, this);
root_window_host_delegate_ = root_window_;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment