| Index: components/bitmap_uploader/bitmap_uploader.cc
|
| diff --git a/components/bitmap_uploader/bitmap_uploader.cc b/components/bitmap_uploader/bitmap_uploader.cc
|
| index 2b1a1f855c9a40bcd0335094628e36b8cafeaa72..d65474277564f8df571bf10aaec56b4ec8fb57f1 100644
|
| --- a/components/bitmap_uploader/bitmap_uploader.cc
|
| +++ b/components/bitmap_uploader/bitmap_uploader.cc
|
| @@ -16,7 +16,7 @@
|
| #include "mojo/converters/surfaces/surfaces_utils.h"
|
| #include "mojo/public/c/gles2/chromium_extension.h"
|
| #include "mojo/public/c/gles2/gles2.h"
|
| -#include "mojo/shell/public/cpp/shell.h"
|
| +#include "mojo/shell/public/cpp/connector.h"
|
|
|
| namespace bitmap_uploader {
|
| namespace {
|
| @@ -46,11 +46,11 @@ BitmapUploader::~BitmapUploader() {
|
| MojoGLES2DestroyContext(gles2_context_);
|
| }
|
|
|
| -void BitmapUploader::Init(mojo::Shell* shell) {
|
| +void BitmapUploader::Init(mojo::Connector* connector) {
|
| surface_ = window_->RequestSurface(mus::mojom::SurfaceType::DEFAULT);
|
| surface_->BindToThread();
|
|
|
| - shell->ConnectToInterface("mojo:mus", &gpu_service_);
|
| + connector->ConnectToInterface("mojo:mus", &gpu_service_);
|
| mus::mojom::CommandBufferPtr gles2_client;
|
| gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client));
|
| gles2_context_ = MojoGLES2CreateContext(
|
|
|