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

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

Issue 790623003: Restructure public side of view_manager service. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: BUILD.gn file reorderings Created 6 years 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
Index: mojo/services/public/cpp/view_manager/lib/view_manager_context.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_context.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_context.cc
deleted file mode 100644
index 2dea3bde5f15ad75ad3d2b25d622619f7039ab67..0000000000000000000000000000000000000000
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_context.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "mojo/services/public/cpp/view_manager/view_manager_context.h"
-
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
-
-namespace mojo {
-class ApplicationImpl;
-
-class ViewManagerContext::InternalState {
- public:
- explicit InternalState(ApplicationImpl* application_impl) {
- application_impl->ConnectToService("mojo:window_manager", &wm_);
- }
- ~InternalState() {}
-
- WindowManager* wm() { return wm_.get(); }
-
- private:
- WindowManagerPtr wm_;
-
- MOJO_DISALLOW_COPY_AND_ASSIGN(InternalState);
-};
-
-ViewManagerContext::ViewManagerContext(ApplicationImpl* application_impl)
- : state_(new InternalState(application_impl)) {}
-ViewManagerContext::~ViewManagerContext() {}
-
-void ViewManagerContext::Embed(const String& url) {
- scoped_ptr<ServiceProviderImpl> spi(new ServiceProviderImpl);
- Embed(url, spi.Pass());
-}
-
-scoped_ptr<ServiceProvider> ViewManagerContext::Embed(
- const String& url,
- scoped_ptr<ServiceProviderImpl> exported_services) {
- scoped_ptr<ServiceProvider> imported_services;
- // BindToProxy() takes ownership of |exported_services|.
- ServiceProviderImpl* registry = exported_services.release();
- ServiceProviderPtr sp;
- if (registry) {
- BindToProxy(registry, &sp);
- imported_services.reset(registry->CreateRemoteServiceProvider());
- }
- state_->wm()->Embed(url, MakeRequest<ServiceProvider>(sp.PassMessagePipe()));
- return imported_services.Pass();
-}
-
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698