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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: examples/wm_flow/wm/frame_controller.h

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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/wm_flow/embedded/embedded.cc ('k') | examples/wm_flow/wm/frame_controller.cc » ('j') | mojo/services/view_manager/public/cpp/view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/wm_flow/wm/frame_controller.h
diff --git a/examples/wm_flow/wm/frame_controller.h b/examples/wm_flow/wm/frame_controller.h
index 95f781d2eca6d9d334b3c50d539583759f373172..e251c76527a57a536b6a73683bd80732f1920c23 100644
--- a/examples/wm_flow/wm/frame_controller.h
+++ b/examples/wm_flow/wm/frame_controller.h
@@ -8,6 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "examples/wm_flow/wm/window_frame_host.mojom.h"
#include "mojo/public/cpp/application/interface_factory.h"
+#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/view_manager/public/cpp/view_observer.h"
#include "services/window_manager/focus_controller.h"
#include "ui/gfx/geometry/rect.h"
@@ -59,7 +60,7 @@ class FrameController
bool maximized_;
gfx::Rect restored_bounds_;
window_manager::WindowManagerApp* window_manager_app_;
- scoped_ptr<mojo::ServiceProvider> viewer_services_;
+ mojo::ServiceProviderImpl viewer_services_impl_;
mojo::Binding<examples::WindowFrameHost> binding_;
« no previous file with comments | « examples/wm_flow/embedded/embedded.cc ('k') | examples/wm_flow/wm/frame_controller.cc » ('j') | mojo/services/view_manager/public/cpp/view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698