| 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 1868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1879 window_->SetType(type); | 1879 window_->SetType(type); |
| 1880 window_->Init(ui::LAYER_SOLID_COLOR); | 1880 window_->Init(ui::LAYER_SOLID_COLOR); |
| 1881 window_->layer()->SetColor(background_color_); | 1881 window_->layer()->SetColor(background_color_); |
| 1882 | 1882 |
| 1883 if (!IsMus()) | 1883 if (!IsMus()) |
| 1884 return; | 1884 return; |
| 1885 | 1885 |
| 1886 // Connect to the renderer, pass it a WindowTreeClient interface request | 1886 // Connect to the renderer, pass it a WindowTreeClient interface request |
| 1887 // and embed that client inside our mus window. | 1887 // and embed that client inside our mus window. |
| 1888 mojom::RenderWidgetWindowTreeClientFactoryPtr factory; | 1888 mojom::RenderWidgetWindowTreeClientFactoryPtr factory; |
| 1889 host_->GetProcess()->GetRemoteInterfaces()->GetInterface(&factory); | 1889 BindInterface(host_->GetProcess(), &factory); |
| 1890 | 1890 |
| 1891 ui::mojom::WindowTreeClientPtr window_tree_client; | 1891 ui::mojom::WindowTreeClientPtr window_tree_client; |
| 1892 factory->CreateWindowTreeClientForRenderWidget( | 1892 factory->CreateWindowTreeClientForRenderWidget( |
| 1893 host_->GetRoutingID(), mojo::MakeRequest(&window_tree_client)); | 1893 host_->GetRoutingID(), mojo::MakeRequest(&window_tree_client)); |
| 1894 aura::WindowPortMus::Get(window_)->Embed( | 1894 aura::WindowPortMus::Get(window_)->Embed( |
| 1895 std::move(window_tree_client), | 1895 std::move(window_tree_client), |
| 1896 ui::mojom::kEmbedFlagEmbedderInterceptsEvents, | 1896 ui::mojom::kEmbedFlagEmbedderInterceptsEvents, |
| 1897 base::Bind(&EmbedCallback)); | 1897 base::Bind(&EmbedCallback)); |
| 1898 } | 1898 } |
| 1899 | 1899 |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2342 } | 2342 } |
| 2343 | 2343 |
| 2344 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { | 2344 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { |
| 2345 if (!delegated_frame_host_) | 2345 if (!delegated_frame_host_) |
| 2346 return; | 2346 return; |
| 2347 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || | 2347 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || |
| 2348 needs_flush_input_); | 2348 needs_flush_input_); |
| 2349 } | 2349 } |
| 2350 | 2350 |
| 2351 } // namespace content | 2351 } // namespace content |
| OLD | NEW |