Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Side by Side Diff: sky/viewer/document_view.cc

Issue 978603002: Fixes ViewManagerClient name in sky (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sky/viewer/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "sky/viewer/document_view.h" 5 #include "sky/viewer/document_view.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
13 #include "mojo/converters/geometry/geometry_type_converters.h" 13 #include "mojo/converters/geometry/geometry_type_converters.h"
14 #include "mojo/converters/input_events/input_events_type_converters.h" 14 #include "mojo/converters/input_events/input_events_type_converters.h"
15 #include "mojo/public/cpp/application/connect.h" 15 #include "mojo/public/cpp/application/connect.h"
16 #include "mojo/public/cpp/system/data_pipe.h" 16 #include "mojo/public/cpp/system/data_pipe.h"
17 #include "mojo/public/interfaces/application/shell.mojom.h" 17 #include "mojo/public/interfaces/application/shell.mojom.h"
18 #include "mojo/services/view_manager/public/cpp/view.h" 18 #include "mojo/services/view_manager/public/cpp/view.h"
19 #include "mojo/services/view_manager/public/cpp/view_manager.h" 19 #include "mojo/services/view_manager/public/cpp/view_manager.h"
20 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
20 #include "skia/ext/refptr.h" 21 #include "skia/ext/refptr.h"
21 #include "sky/compositor/layer.h" 22 #include "sky/compositor/layer.h"
22 #include "sky/compositor/layer_host.h" 23 #include "sky/compositor/layer_host.h"
23 #include "sky/compositor/rasterizer_bitmap.h" 24 #include "sky/compositor/rasterizer_bitmap.h"
24 #include "sky/compositor/rasterizer_ganesh.h" 25 #include "sky/compositor/rasterizer_ganesh.h"
25 #include "sky/engine/public/platform/Platform.h" 26 #include "sky/engine/public/platform/Platform.h"
26 #include "sky/engine/public/platform/WebHTTPHeaderVisitor.h" 27 #include "sky/engine/public/platform/WebHTTPHeaderVisitor.h"
27 #include "sky/engine/public/platform/WebInputEvent.h" 28 #include "sky/engine/public/platform/WebInputEvent.h"
28 #include "sky/engine/public/platform/WebScreenInfo.h" 29 #include "sky/engine/public/platform/WebScreenInfo.h"
29 #include "sky/engine/public/web/Sky.h" 30 #include "sky/engine/public/web/Sky.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 } 363 }
363 } 364 }
364 365
365 void DocumentView::StartDebuggerInspectorBackend() { 366 void DocumentView::StartDebuggerInspectorBackend() {
366 // FIXME: Do we need this for dart? 367 // FIXME: Do we need this for dart?
367 } 368 }
368 369
369 void DocumentView::InitServiceRegistry() { 370 void DocumentView::InitServiceRegistry() {
370 mojo::ConnectToService(imported_services_.get(), &service_registry_); 371 mojo::ConnectToService(imported_services_.get(), &service_registry_);
371 mojo::Array<mojo::String> interface_names(1); 372 mojo::Array<mojo::String> interface_names(1);
372 interface_names[0] = "ViewManagerClient"; 373 interface_names[0] = mojo::ViewManagerClient::Name_;
373 mojo::ServiceProviderImpl* sp_impl(new mojo::ServiceProviderImpl()); 374 mojo::ServiceProviderImpl* sp_impl(new mojo::ServiceProviderImpl());
374 sp_impl->AddService(&view_manager_client_factory_); 375 sp_impl->AddService(&view_manager_client_factory_);
375 mojo::ServiceProviderPtr sp; 376 mojo::ServiceProviderPtr sp;
376 service_registry_service_provider_binding_.reset( 377 service_registry_service_provider_binding_.reset(
377 new mojo::StrongBinding<mojo::ServiceProvider>(sp_impl, &sp)); 378 new mojo::StrongBinding<mojo::ServiceProvider>(sp_impl, &sp));
378 service_registry_->AddServices(interface_names.Pass(), sp.Pass()); 379 service_registry_->AddServices(interface_names.Pass(), sp.Pass());
379 } 380 }
380 381
381 } // namespace sky 382 } // namespace sky
OLDNEW
« no previous file with comments | « sky/viewer/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698