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

Side by Side Diff: mojo/services/view_manager/public/cpp/lib/view_manager_context.cc

Issue 830593003: Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick mojo 9d3b8dd17f12d20035a14737fdc38dd926890ff8 Created 5 years, 11 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
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 "mojo/services/view_manager/public/cpp/view_manager_context.h" 5 #include "view_manager/public/cpp/view_manager_context.h"
6 6
7 #include "mojo/public/cpp/application/application_impl.h" 7 #include "mojo/public/cpp/application/application_impl.h"
8 #include "mojo/public/cpp/bindings/interface_request.h" 8 #include "mojo/public/cpp/bindings/interface_request.h"
9 #include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h" 9 #include "window_manager/public/interfaces/window_manager.mojom.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 class ApplicationImpl; 12 class ApplicationImpl;
13 13
14 class ViewManagerContext::InternalState { 14 class ViewManagerContext::InternalState {
15 public: 15 public:
16 explicit InternalState(ApplicationImpl* application_impl) { 16 explicit InternalState(ApplicationImpl* application_impl) {
17 application_impl->ConnectToService("mojo:window_manager", &wm_); 17 application_impl->ConnectToService("mojo:window_manager", &wm_);
18 } 18 }
19 ~InternalState() {} 19 ~InternalState() {}
(...skipping 24 matching lines...) Expand all
44 ServiceProviderPtr sp; 44 ServiceProviderPtr sp;
45 if (registry) { 45 if (registry) {
46 BindToProxy(registry, &sp); 46 BindToProxy(registry, &sp);
47 imported_services.reset(registry->CreateRemoteServiceProvider()); 47 imported_services.reset(registry->CreateRemoteServiceProvider());
48 } 48 }
49 state_->wm()->Embed(url, MakeRequest<ServiceProvider>(sp.PassMessagePipe())); 49 state_->wm()->Embed(url, MakeRequest<ServiceProvider>(sp.PassMessagePipe()));
50 return imported_services.Pass(); 50 return imported_services.Pass();
51 } 51 }
52 52
53 } // namespace mojo 53 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698