diff options
| author | sky <sky@chromium.org> | 2015-11-25 10:31:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-25 18:31:57 +0000 |
| commit | 7a89d33270dbfd1db9fc8b989a0c7741eb10ff0b (patch) | |
| tree | 3d45fb05f44192dd0f299bf4a4a07004b4f52a97 /components/bitmap_uploader | |
| parent | 1761ef2855918b3e54d974a7fa1a860d604d660f (diff) | |
| download | chromium_src-7a89d33270dbfd1db9fc8b989a0c7741eb10ff0b.zip chromium_src-7a89d33270dbfd1db9fc8b989a0c7741eb10ff0b.tar.gz chromium_src-7a89d33270dbfd1db9fc8b989a0c7741eb10ff0b.tar.bz2 | |
Updates ConnectToApplication for BitmapLoader
Makes it use permissive capability filter rather than null (which
DCHECKs now).
BUG=none
TEST=none
R=ben@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/1479453003
Cr-Commit-Position: refs/heads/master@{#361704}
Diffstat (limited to 'components/bitmap_uploader')
| -rw-r--r-- | components/bitmap_uploader/bitmap_uploader.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/bitmap_uploader/bitmap_uploader.cc b/components/bitmap_uploader/bitmap_uploader.cc index bfa8cd9..d570952 100644 --- a/components/bitmap_uploader/bitmap_uploader.cc +++ b/components/bitmap_uploader/bitmap_uploader.cc @@ -8,6 +8,7 @@ #include "base/callback.h" #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_surface.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/connect.h" #include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" @@ -56,7 +57,8 @@ void BitmapUploader::Init(mojo::Shell* shell) { request2->url = mojo::String::From("mojo:mus"); shell->ConnectToApplication(request2.Pass(), mojo::GetProxy(&gpu_service_provider), nullptr, - nullptr, base::Bind(&OnGotContentHandlerID)); + mojo::CreatePermissiveCapabilityFilter(), + base::Bind(&OnGotContentHandlerID)); ConnectToService(gpu_service_provider.get(), &gpu_service_); mus::mojom::CommandBufferPtr gles2_client; |