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

Unified Diff: third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h

Issue 910883002: Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Apply 9f87aeadbda22441b7d469e596f7bd7d0d73e2a8 (https://codereview.chromium.org/908973002/) Created 5 years, 10 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
Index: third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h
diff --git a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h
index e0d7bbaf19140fd98ce4a79ea52698eebd2fb445..b3dd1fd231c1c9d2d6ad980afb2955123d7a1feb 100644
--- a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h
@@ -29,11 +29,11 @@ class ViewManagerClientImpl : public ViewManager,
public:
ViewManagerClientImpl(ViewManagerDelegate* delegate,
Shell* shell,
- ScopedMessagePipeHandle handle,
+ InterfaceRequest<ViewManagerClient> request,
bool delete_on_error);
~ViewManagerClientImpl() override;
- bool connected() const { return connected_; }
+ bool connected() const { return service_; }
ConnectionSpecificId connection_id() const { return connection_id_; }
// API exposed to the view implementations that pushes local changes to the
@@ -77,6 +77,8 @@ class ViewManagerClientImpl : public ViewManager,
void AddView(View* view);
void RemoveView(Id view_id);
+ void SetViewManagerService(ViewManagerServicePtr service);
+
private:
friend class RootObserver;
@@ -95,6 +97,7 @@ class ViewManagerClientImpl : public ViewManager,
void OnEmbed(ConnectionSpecificId connection_id,
const String& creator_url,
ViewDataPtr root,
+ ViewManagerServicePtr view_manager_service,
InterfaceRequest<ServiceProvider> services,
ServiceProviderPtr exposed_services,
ScopedMessagePipeHandle window_manager_pipe) override;
@@ -142,7 +145,6 @@ class ViewManagerClientImpl : public ViewManager,
uint32_t focused_view_id,
uint32_t active_view_id);
- bool connected_;
ConnectionSpecificId connection_id_;
ConnectionSpecificId next_id_;
@@ -164,7 +166,7 @@ class ViewManagerClientImpl : public ViewManager,
Binding<WindowManagerObserver> wm_observer_binding_;
Binding<ViewManagerClient> binding_;
- ViewManagerService* service_;
+ ViewManagerServicePtr service_;
const bool delete_on_error_;
DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);

Powered by Google App Engine
This is Rietveld 408576698