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

Unified Diff: examples/embedded_app/embedded_app.cc

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase for trybots (no code changes from ps2) 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/browser/browser.cc ('k') | examples/ganesh_app/ganesh_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/embedded_app/embedded_app.cc
diff --git a/examples/embedded_app/embedded_app.cc b/examples/embedded_app/embedded_app.cc
index e08e9fa6b1324a38861121ff64adacdea39fbacd..4e07c7b02b4f1ae00f53a63ff1f2d12aedaf87e5 100644
--- a/examples/embedded_app/embedded_app.cc
+++ b/examples/embedded_app/embedded_app.cc
@@ -33,9 +33,7 @@ const SkColor kColors[] = {SK_ColorYELLOW, SK_ColorRED, SK_ColorGREEN,
SK_ColorMAGENTA};
struct Window {
- Window(View* root,
- scoped_ptr<ServiceProvider> embedder_service_provider,
- Shell* shell)
+ Window(View* root, ServiceProviderPtr embedder_service_provider, Shell* shell)
: root(root),
embedder_service_provider(embedder_service_provider.Pass()),
bitmap_uploader(root) {
@@ -43,7 +41,7 @@ struct Window {
}
View* root;
- scoped_ptr<ServiceProvider> embedder_service_provider;
+ ServiceProviderPtr embedder_service_provider;
BitmapUploader bitmap_uploader;
};
@@ -72,10 +70,10 @@ class EmbeddedApp
// Overridden from ViewManagerDelegate:
virtual void OnEmbed(View* root,
- ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) override {
+ InterfaceRequest<ServiceProvider> services,
+ ServiceProviderPtr exposed_services) override {
root->AddObserver(this);
- Window* window = new Window(root, imported_services.Pass(), shell_);
+ Window* window = new Window(root, exposed_services.Pass(), shell_);
windows_[root->id()] = window;
window->bitmap_uploader.SetColor(
kColors[next_color_++ % arraysize(kColors)]);
« no previous file with comments | « examples/browser/browser.cc ('k') | examples/ganesh_app/ganesh_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698