OLD | NEW |
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 "mojo/services/public/cpp/view_manager/view.h" | 5 #include "mojo/services/public/cpp/view_manager/view.h" |
6 | 6 |
7 #include "mojo/public/cpp/application/connect.h" | 7 #include "mojo/public/cpp/application/connect.h" |
8 #include "mojo/public/cpp/application/service_provider_impl.h" | 8 #include "mojo/public/cpp/application/service_provider_impl.h" |
9 #include "mojo/public/interfaces/application/shell.mojom.h" | 9 #include "mojo/public/interfaces/application/shell.mojom.h" |
10 #include "mojo/services/public/cpp/view_manager/lib/bitmap_uploader.h" | 10 #include "mojo/services/public/cpp/view_manager/lib/bitmap_uploader.h" |
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDrawnChanging(this)); | 435 FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDrawnChanging(this)); |
436 drawn_ = value; | 436 drawn_ = value; |
437 FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDrawnChanged(this)); | 437 FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDrawnChanged(this)); |
438 } | 438 } |
439 | 439 |
440 void View::CreateBitmapUploader() { | 440 void View::CreateBitmapUploader() { |
441 ViewManagerClientImpl* vmci = static_cast<ViewManagerClientImpl*>(manager_); | 441 ViewManagerClientImpl* vmci = static_cast<ViewManagerClientImpl*>(manager_); |
442 SurfacesServicePtr surfaces_service; | 442 SurfacesServicePtr surfaces_service; |
443 InterfacePtr<ServiceProvider> surfaces_service_provider; | 443 InterfacePtr<ServiceProvider> surfaces_service_provider; |
444 vmci->shell()->ConnectToApplication("mojo:mojo_surfaces_service", | 444 vmci->shell()->ConnectToApplication("mojo:mojo_surfaces_service", |
445 Get(&surfaces_service_provider)); | 445 GetProxy(&surfaces_service_provider)); |
446 ConnectToService(surfaces_service_provider.get(), &surfaces_service); | 446 ConnectToService(surfaces_service_provider.get(), &surfaces_service); |
447 GpuPtr gpu_service; | 447 GpuPtr gpu_service; |
448 InterfacePtr<ServiceProvider> gpu_service_provider; | 448 InterfacePtr<ServiceProvider> gpu_service_provider; |
449 vmci->shell()->ConnectToApplication("mojo:mojo_native_viewport_service", | 449 vmci->shell()->ConnectToApplication("mojo:mojo_native_viewport_service", |
450 Get(&gpu_service_provider)); | 450 GetProxy(&gpu_service_provider)); |
451 ConnectToService(gpu_service_provider.get(), &gpu_service); | 451 ConnectToService(gpu_service_provider.get(), &gpu_service); |
452 bitmap_uploader_.reset(new BitmapUploader( | 452 bitmap_uploader_.reset(new BitmapUploader( |
453 vmci, id_, surfaces_service.Pass(), gpu_service.Pass())); | 453 vmci, id_, surfaces_service.Pass(), gpu_service.Pass())); |
454 } | 454 } |
455 | 455 |
456 } // namespace mojo | 456 } // namespace mojo |
OLD | NEW |