| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_mus.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mus.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "content/browser/renderer_host/render_process_host_impl.h" | 10 #include "content/browser/renderer_host/render_process_host_impl.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 window->SetVisible(true); | 36 window->SetVisible(true); |
| 37 window->SetBounds(gfx::Rect(300, 300)); | 37 window->SetBounds(gfx::Rect(300, 300)); |
| 38 window->set_input_event_handler(this); | 38 window->set_input_event_handler(this); |
| 39 parent_window->AddChild(window); | 39 parent_window->AddChild(window); |
| 40 mus_window_.reset(new ui::ScopedWindowPtr(window)); | 40 mus_window_.reset(new ui::ScopedWindowPtr(window)); |
| 41 host_->SetView(this); | 41 host_->SetView(this); |
| 42 | 42 |
| 43 // Connect to the renderer, pass it a WindowTreeClient interface request | 43 // Connect to the renderer, pass it a WindowTreeClient interface request |
| 44 // and embed that client inside our mus window. | 44 // and embed that client inside our mus window. |
| 45 mojom::RenderWidgetWindowTreeClientFactoryPtr factory; | 45 mojom::RenderWidgetWindowTreeClientFactoryPtr factory; |
| 46 host_->GetProcess()->GetRemoteInterfaces()->GetInterface(&factory); | 46 host_->GetProcess()->GetChildConnection()->GetInterface(&factory); |
| 47 | 47 |
| 48 ui::mojom::WindowTreeClientPtr window_tree_client; | 48 ui::mojom::WindowTreeClientPtr window_tree_client; |
| 49 factory->CreateWindowTreeClientForRenderWidget( | 49 factory->CreateWindowTreeClientForRenderWidget( |
| 50 host_->GetRoutingID(), mojo::GetProxy(&window_tree_client)); | 50 host_->GetRoutingID(), mojo::GetProxy(&window_tree_client)); |
| 51 mus_window_->window()->Embed(std::move(window_tree_client), | 51 mus_window_->window()->Embed(std::move(window_tree_client), |
| 52 ui::mojom::kEmbedFlagEmbedderInterceptsEvents); | 52 ui::mojom::kEmbedFlagEmbedderInterceptsEvents); |
| 53 } | 53 } |
| 54 | 54 |
| 55 RenderWidgetHostViewMus::~RenderWidgetHostViewMus() {} | 55 RenderWidgetHostViewMus::~RenderWidgetHostViewMus() {} |
| 56 | 56 |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 | 305 |
| 306 void RenderWidgetHostViewMus::OnWindowInputEvent( | 306 void RenderWidgetHostViewMus::OnWindowInputEvent( |
| 307 ui::Window* window, | 307 ui::Window* window, |
| 308 const ui::Event& event, | 308 const ui::Event& event, |
| 309 std::unique_ptr<base::Callback<void(ui::mojom::EventResult)>>* | 309 std::unique_ptr<base::Callback<void(ui::mojom::EventResult)>>* |
| 310 ack_callback) { | 310 ack_callback) { |
| 311 // TODO(sad): Dispatch |event| to the RenderWidgetHost. | 311 // TODO(sad): Dispatch |event| to the RenderWidgetHost. |
| 312 } | 312 } |
| 313 | 313 |
| 314 } // namespace content | 314 } // namespace content |
| OLD | NEW |