Merge arc/common/settings.mojom into intent_helper.mojom

chrome/browser/chromeos/arc/arc_intent_helper_bridge.h

Index: chrome/browser/chromeos/arc/arc_intent_helper_bridge.h
diff --git a/chrome/browser/chromeos/arc/arc_intent_helper_bridge.h b/chrome/browser/chromeos/arc/arc_intent_helper_bridge.h
index 274004c71b5528276b7b27b4a5826f54da173681..bc89532cd54e23289f2c7987dda5deb8210975b3 100644
--- a/chrome/browser/chromeos/arc/arc_intent_helper_bridge.h
+++ b/chrome/browser/chromeos/arc/arc_intent_helper_bridge.h
@@ -5,6 +5,8 @@
 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_INTENT_HELPER_BRIDGE_H_
 
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/chromeos/arc/settings_bridge.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service.h"
 #include "components/arc/common/intent_helper.mojom.h"
@@ -15,19 +17,27 @@ namespace arc {
 // Receives intents from ARC.
 class ArcIntentHelperBridge : public ArcService,
                               public ArcBridgeService::Observer,
-                              public IntentHelperHost {
+                              public IntentHelperHost,
+                              public SettingsBridge::Delegate {
  public:
   explicit ArcIntentHelperBridge(ArcBridgeService* bridge_service);
   ~ArcIntentHelperBridge() override;
 
   // ArcBridgeService::Observer
   void OnIntentHelperInstanceReady() override;
+  void OnIntentHelperInstanceClosed() override;
+
+  // SettingsBridge::Delegate. Sends a broadcast to the ArcIntentHelper app
+  // in Android.
+  void OnBroadcastNeeded(const std::string& action,
+                         const base::DictionaryValue& extras) override;
 
   // arc::IntentHelperHost
   void OnOpenUrl(const mojo::String& url) override;
 
  private:
   mojo::Binding<IntentHelperHost> binding_;
+  scoped_ptr<SettingsBridge> settings_bridge_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcIntentHelperBridge);
 };