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

Unified Diff: services/ui/launcher/launch_instance.h

Issue 1949233002: Create a RegisterViewAssociate method in ViewManager (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: one more compile fix Created 4 years, 7 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: services/ui/launcher/launch_instance.h
diff --git a/services/ui/launcher/launch_instance.h b/services/ui/launcher/launch_instance.h
index 644f31dbb817a44cc35e0c8f5f037bbbdb9eeb69..948a09d3553dc490749c5d115ecb9fa05150205b 100644
--- a/services/ui/launcher/launch_instance.h
+++ b/services/ui/launcher/launch_instance.h
@@ -24,11 +24,14 @@ class LaunchInstance : public mojo::NativeViewportEventDispatcher {
public:
LaunchInstance(mojo::ApplicationImpl* app_impl,
const std::string& app_url,
+ const std::string& view_associates_urls,
const base::Closure& shutdown_callback);
~LaunchInstance() override;
void Launch();
+ void OnViewAssociateConnectionError();
+
private:
// |NativeViewportEventDispatcher|:
void OnEvent(mojo::EventPtr event,
@@ -45,6 +48,7 @@ class LaunchInstance : public mojo::NativeViewportEventDispatcher {
mojo::ApplicationImpl* app_impl_;
std::string app_url_;
+ std::string view_associate_urls_;
base::Closure shutdown_callback_;
mojo::gfx::composition::CompositorPtr compositor_;
@@ -56,6 +60,8 @@ class LaunchInstance : public mojo::NativeViewportEventDispatcher {
std::unique_ptr<LauncherViewTree> view_tree_;
+ std::vector<mojo::ui::ViewAssociateOwnerPtr> view_associate_owners_;
+
mojo::ui::ViewOwnerPtr client_view_owner_;
DISALLOW_COPY_AND_ASSIGN(LaunchInstance);

Powered by Google App Engine
This is Rietveld 408576698