| 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 1879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1890 if (!IsMus()) | 1890 if (!IsMus()) |
| 1891 return; | 1891 return; |
| 1892 | 1892 |
| 1893 // Connect to the renderer, pass it a WindowTreeClient interface request | 1893 // Connect to the renderer, pass it a WindowTreeClient interface request |
| 1894 // and embed that client inside our mus window. | 1894 // and embed that client inside our mus window. |
| 1895 mojom::RenderWidgetWindowTreeClientFactoryPtr factory; | 1895 mojom::RenderWidgetWindowTreeClientFactoryPtr factory; |
| 1896 host_->GetProcess()->GetRemoteInterfaces()->GetInterface(&factory); | 1896 host_->GetProcess()->GetRemoteInterfaces()->GetInterface(&factory); |
| 1897 | 1897 |
| 1898 ui::mojom::WindowTreeClientPtr window_tree_client; | 1898 ui::mojom::WindowTreeClientPtr window_tree_client; |
| 1899 factory->CreateWindowTreeClientForRenderWidget( | 1899 factory->CreateWindowTreeClientForRenderWidget( |
| 1900 host_->GetRoutingID(), mojo::GetProxy(&window_tree_client)); | 1900 host_->GetRoutingID(), mojo::MakeRequest(&window_tree_client)); |
| 1901 aura::WindowPortMus::Get(window_)->Embed( | 1901 aura::WindowPortMus::Get(window_)->Embed( |
| 1902 std::move(window_tree_client), | 1902 std::move(window_tree_client), |
| 1903 ui::mojom::kEmbedFlagEmbedderInterceptsEvents, | 1903 ui::mojom::kEmbedFlagEmbedderInterceptsEvents, |
| 1904 base::Bind(&EmbedCallback)); | 1904 base::Bind(&EmbedCallback)); |
| 1905 } | 1905 } |
| 1906 | 1906 |
| 1907 void RenderWidgetHostViewAura::CreateDelegatedFrameHostClient() { | 1907 void RenderWidgetHostViewAura::CreateDelegatedFrameHostClient() { |
| 1908 if (IsMus()) | 1908 if (IsMus()) |
| 1909 return; | 1909 return; |
| 1910 | 1910 |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2380 | 2380 |
| 2381 void RenderWidgetHostViewAura::SetPopupChild( | 2381 void RenderWidgetHostViewAura::SetPopupChild( |
| 2382 RenderWidgetHostViewAura* popup_child_host_view) { | 2382 RenderWidgetHostViewAura* popup_child_host_view) { |
| 2383 popup_child_host_view_ = popup_child_host_view; | 2383 popup_child_host_view_ = popup_child_host_view; |
| 2384 event_handler_->SetPopupChild( | 2384 event_handler_->SetPopupChild( |
| 2385 popup_child_host_view, | 2385 popup_child_host_view, |
| 2386 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2386 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
| 2387 } | 2387 } |
| 2388 | 2388 |
| 2389 } // namespace content | 2389 } // namespace content |
| OLD | NEW |