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

Side by Side Diff: content/common/mojo/mojo_shell_connection_impl.h

Issue 1797153002: Reinstate wait-for-Initialize when Chrome is run in Mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell-client
Patch Set: fix views_mus_unittests too Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « chrome/app/mash/mash_runner.cc ('k') | content/common/mojo/mojo_shell_connection_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ 5 #ifndef CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
6 #define CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ 6 #define CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 private: 43 private:
44 explicit MojoShellConnectionImpl(bool external); 44 explicit MojoShellConnectionImpl(bool external);
45 ~MojoShellConnectionImpl() override; 45 ~MojoShellConnectionImpl() override;
46 46
47 // mojo::ShellClient: 47 // mojo::ShellClient:
48 void Initialize(mojo::Connector* connector, 48 void Initialize(mojo::Connector* connector,
49 const mojo::Identity& identity, 49 const mojo::Identity& identity,
50 uint32_t id) override; 50 uint32_t id) override;
51 bool AcceptConnection(mojo::Connection* connection) override; 51 bool AcceptConnection(mojo::Connection* connection) override;
52 void ShellConnectionLost() override;
52 53
53 // MojoShellConnection: 54 // MojoShellConnection:
54 mojo::Connector* GetConnector() override; 55 mojo::Connector* GetConnector() override;
55 bool UsingExternalShell() const override; 56 bool UsingExternalShell() const override;
56 void AddListener(Listener* listener) override; 57 void AddListener(Listener* listener) override;
57 void RemoveListener(Listener* listener) override; 58 void RemoveListener(Listener* listener) override;
58 59
59 bool external_; 60 bool external_;
60 scoped_ptr<mojo::ShellConnection> shell_connection_; 61 scoped_ptr<mojo::ShellConnection> shell_connection_;
61 std::vector<Listener*> listeners_; 62 std::vector<Listener*> listeners_;
62 63
63 DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl); 64 DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl);
64 }; 65 };
65 66
66 } // namespace content 67 } // namespace content
67 68
68 #endif // CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ 69 #endif // CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/app/mash/mash_runner.cc ('k') | content/common/mojo/mojo_shell_connection_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698