mojo/shell/public/cpp/lib/connector_impl.h - Issue 1736663003: Eliminate Quit() from Shell, and roll Shell & Connector together.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/shell/public/cpp/lib/connector_impl.h

Issue 1736663003: Eliminate Quit() from Shell, and roll Shell & Connector together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@14cf

Patch Set: . Created 4 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

« content/renderer/render_frame_impl.h ('K') | « mojo/shell/public/cpp/lib/application_test_base.cc ('k') | mojo/shell/public/cpp/lib/connector_impl.cc » ('j') | mojo/shell/public/cpp/lib/shell_connection.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/shell/public/cpp/lib/connector_impl.h

diff --git a/mojo/shell/public/cpp/lib/connector_impl.h b/mojo/shell/public/cpp/lib/connector_impl.h

index 97829323ea4ea40cc90f3d7a87b19bdcfe63bbad..60bee1e807bb14673c080fca4178fd81c502ea6e 100644

--- a/mojo/shell/public/cpp/lib/connector_impl.h

+++ b/mojo/shell/public/cpp/lib/connector_impl.h

@@ -5,6 +5,7 @@

#ifndef MOJO_SHELL_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_

#define MOJO_SHELL_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_

+#include "base/callback.h"

#include "base/threading/thread_checker.h"

#include "mojo/shell/public/cpp/connector.h"

#include "mojo/shell/public/interfaces/shell.mojom.h"

@@ -14,6 +15,8 @@ namespace mojo {

class ConnectorImpl : public Connector {

public:

explicit ConnectorImpl(shell::mojom::ConnectorPtrInfo unbound_state);

+ ConnectorImpl(shell::mojom::ConnectorPtr connector,

+ const base::Closure& connection_error_closure);

~ConnectorImpl();

private: