OLD | NEW |
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 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1853 | 1853 |
1854 void RenderWidgetHostViewAura::CreateAuraWindow() { | 1854 void RenderWidgetHostViewAura::CreateAuraWindow() { |
1855 DCHECK(!window_); | 1855 DCHECK(!window_); |
1856 window_ = new aura::Window(this); | 1856 window_ = new aura::Window(this); |
1857 event_handler_->set_window(window_); | 1857 event_handler_->set_window(window_); |
1858 window_observer_.reset(new WindowObserver(this)); | 1858 window_observer_.reset(new WindowObserver(this)); |
1859 | 1859 |
1860 aura::client::SetTooltipText(window_, &tooltip_); | 1860 aura::client::SetTooltipText(window_, &tooltip_); |
1861 aura::client::SetActivationDelegate(window_, this); | 1861 aura::client::SetActivationDelegate(window_, this); |
1862 aura::client::SetFocusChangeObserver(window_, this); | 1862 aura::client::SetFocusChangeObserver(window_, this); |
1863 window_->set_layer_owner_delegate(delegated_frame_host_.get()); | |
1864 display::Screen::GetScreen()->AddObserver(this); | 1863 display::Screen::GetScreen()->AddObserver(this); |
1865 } | 1864 } |
1866 | 1865 |
1867 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { | 1866 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
1868 if (host_->GetProcess()->FastShutdownStarted()) | 1867 if (host_->GetProcess()->FastShutdownStarted()) |
1869 return; | 1868 return; |
1870 | 1869 |
1871 aura::Window* root_window = window_->GetRootWindow(); | 1870 aura::Window* root_window = window_->GetRootWindow(); |
1872 if (!root_window) | 1871 if (!root_window) |
1873 return; | 1872 return; |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2381 | 2380 |
2382 void RenderWidgetHostViewAura::SetPopupChild( | 2381 void RenderWidgetHostViewAura::SetPopupChild( |
2383 RenderWidgetHostViewAura* popup_child_host_view) { | 2382 RenderWidgetHostViewAura* popup_child_host_view) { |
2384 popup_child_host_view_ = popup_child_host_view; | 2383 popup_child_host_view_ = popup_child_host_view; |
2385 event_handler_->SetPopupChild( | 2384 event_handler_->SetPopupChild( |
2386 popup_child_host_view, | 2385 popup_child_host_view, |
2387 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2386 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
2388 } | 2387 } |
2389 | 2388 |
2390 } // namespace content | 2389 } // namespace content |
OLD | NEW |