Index: ui/views/widget/desktop_root_window_host_linux.cc |
=================================================================== |
--- ui/views/widget/desktop_root_window_host_linux.cc (revision 160403) |
+++ ui/views/widget/desktop_root_window_host_linux.cc (working copy) |
@@ -157,7 +157,6 @@ |
root_window_->Init(); |
root_window_->AddChild(content_window_); |
root_window_->SetLayoutManager(new DesktopLayoutManager(root_window_)); |
- root_window_host_delegate_ = root_window_; |
// If we're given a parent, we need to mark ourselves as transient to another |
// window. Otherwise activation gets screwy. |
@@ -559,6 +558,11 @@ |
//////////////////////////////////////////////////////////////////////////////// |
// DesktopRootWindowHostLinux, aura::RootWindowHost implementation: |
+void DesktopRootWindowHostLinux::SetDelegate( |
+ aura::RootWindowHostDelegate* delegate) { |
+ root_window_host_delegate_ = delegate; |
+} |
+ |
aura::RootWindow* DesktopRootWindowHostLinux::GetRootWindow() { |
return root_window_; |
} |