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

chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h

Index: chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h
diff --git a/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h b/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h
index 5af1f443c7a22ffbfbd2f280b0cbc163c2956e7c..27e25327945f218c2793cf83bb8b6b4df427e9a7 100644
--- a/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h
+++ b/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h
@@ -5,6 +5,8 @@
 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_INTENT_HELPER_BRIDGE_IMPL_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/common/intent_helper.mojom.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
@@ -15,7 +17,8 @@ namespace arc {
 // Receives intents from ARC.
 class ArcIntentHelperBridgeImpl : public ArcIntentHelperBridge,
                                   public ArcBridgeService::Observer,
-                                  public IntentHelperHost {
+                                  public IntentHelperHost,
+                                  public SettingsBridge::Delegate {
  public:
   ArcIntentHelperBridgeImpl();
   ~ArcIntentHelperBridgeImpl() override;
@@ -25,13 +28,21 @@ class ArcIntentHelperBridgeImpl : public ArcIntentHelperBridge,
   void StartObservingBridgeServiceChanges() override;
 
   // ArcBridgeService::Observer
+  void OnStateChanged(ArcBridgeService::State state) override;
   void OnIntentHelperInstanceReady() 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(ArcIntentHelperBridgeImpl);
 };