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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mandoline/ui/aura/surface_binding.cc

Issue 1245683004: Mandoline: Merge Surfaces and Views apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove context_provider.mojom Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« mandoline/services/core_services/core_services_application_delegate.cc ('K') | « mandoline/services/core_services/core_services_application_delegate.cc ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/aura/surface_binding.cc
diff --git a/mandoline/ui/aura/surface_binding.cc b/mandoline/ui/aura/surface_binding.cc
index f610fed0f658132d6d35602d1ccf676d9b91d5c3..6642ca1decb13cea8714923815bc7bc8965d0805 100644
--- a/mandoline/ui/aura/surface_binding.cc
+++ b/mandoline/ui/aura/surface_binding.cc
@@ -52,7 +52,6 @@ class OutputSurfaceImpl : public cc::OutputSurface {
uint32_t local_id_;
gfx::Size surface_size_;
- DISALLOW_COPY_AND_ASSIGN(OutputSurfaceImpl);
rjkroege 2015/08/06 00:16:22 why did you remove? maybe not a good idea?
Fady Samuel 2015/08/06 16:48:24 accident. Restored.
};
OutputSurfaceImpl::OutputSurfaceImpl(
@@ -205,7 +204,7 @@ void SurfaceBinding::PerViewManagerState::Init() {
mojo::ServiceProviderPtr surfaces_service_provider;
mojo::URLRequestPtr request(mojo::URLRequest::New());
- request->url = mojo::String::From("mojo:surfaces_service");
+ request->url = mojo::String::From("mojo:view_manager");
shell_->ConnectToApplication(request.Pass(),
GetProxy(&surfaces_service_provider),
nullptr,
« mandoline/services/core_services/core_services_application_delegate.cc ('K') | « mandoline/services/core_services/core_services_application_delegate.cc ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698