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

Unified Diff: components/arc/arc_bridge_service.h

Issue 2133653002: arc: Notify ARC instance failures via callbacks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased to master. Created 4 years, 5 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 | « components/arc/arc_bridge_bootstrap.cc ('k') | components/arc/arc_bridge_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/arc_bridge_service.h
diff --git a/components/arc/arc_bridge_service.h b/components/arc/arc_bridge_service.h
index 86b8ec6bb2fccd28b8d771a671cf55f42ed9227e..186800bc261a65ebe921f6f4ff0b3210f96ca529 100644
--- a/components/arc/arc_bridge_service.h
+++ b/components/arc/arc_bridge_service.h
@@ -22,7 +22,6 @@ class CommandLine;
namespace arc {
-class ArcBridgeBootstrap;
class ArcBridgeTest;
// The Chrome-side service that handles ARC instances and ARC bridge creation.
@@ -30,12 +29,26 @@ class ArcBridgeTest;
// communication channel (the ARC bridge) used to send and receive messages.
class ArcBridgeService : public mojom::ArcBridgeHost {
public:
+ // Describes the reason the bridge is stopped.
+ enum class StopReason {
+ // ARC instance has been gracefully shut down.
+ SHUTDOWN,
+
+ // Errors occurred during the ARC instance boot. This includes any failures
+ // before the instance is actually attempted to be started, and also
+ // failures on bootstrapping IPC channels with Android.
+ GENERIC_BOOT_FAILURE,
+
+ // ARC instance has crashed.
+ CRASH,
+ };
+
// Notifies life cycle events of ArcBridgeService.
class Observer {
public:
// Called whenever the state of the bridge has changed.
virtual void OnBridgeReady() {}
- virtual void OnBridgeStopped() {}
+ virtual void OnBridgeStopped(StopReason reason) {}
// Called whenever ARC's availability has changed for this system.
virtual void OnAvailableChanged(bool available) {}
@@ -195,6 +208,11 @@ class ArcBridgeService : public mojom::ArcBridgeHost {
// Changes the current availability and notifies all observers.
void SetAvailable(bool availability);
+ // Sets the reason the bridge is stopped. This function must be always called
+ // before SetState(State::STOPPED) to report a correct reason with
+ // Observer::OnBridgeStopped().
+ void SetStopReason(StopReason stop_reason);
+
base::ObserverList<Observer>& observer_list() { return observer_list_; }
bool CalledOnValidThread();
@@ -208,6 +226,7 @@ class ArcBridgeService : public mojom::ArcBridgeHost {
FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Prerequisites);
FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, ShutdownMidStartup);
FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart);
+ FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, OnBridgeStopped);
// Instance holders.
InstanceHolder<mojom::AppInstance> app_;
@@ -240,6 +259,9 @@ class ArcBridgeService : public mojom::ArcBridgeHost {
// The current state of the bridge.
ArcBridgeService::State state_;
+ // The reason the bridge is stopped.
+ StopReason stop_reason_;
+
// WeakPtrFactory to use callbacks.
base::WeakPtrFactory<ArcBridgeService> weak_factory_;
« no previous file with comments | « components/arc/arc_bridge_bootstrap.cc ('k') | components/arc/arc_bridge_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698