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

components/arc/arc_bridge_service.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
 #define COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 91 matching lines @@
     virtual void OnNotificationsInstanceClosed() {}
 
     // Called whenever the ARC power interface state changes.
     virtual void OnPowerInstanceReady() {}
     virtual void OnPowerInstanceClosed() {}
 
     // Called whenever the ARC process interface state changes.
     virtual void OnProcessInstanceReady() {}
     virtual void OnProcessInstanceClosed() {}
 
-    // Called whenever the ARC settings interface state changes.
-    virtual void OnSettingsInstanceReady() {}
-    virtual void OnSettingsInstanceClosed() {}
-
     // Called whenever the ARC video interface state changes.
     virtual void OnVideoInstanceReady() {}
     virtual void OnVideoInstanceClosed() {}
 
    protected:
     virtual ~Observer() {}
   };
 
   ~ArcBridgeService() override;
 
@@ skipping 34 matching lines @@
   ImeInstance* ime_instance() { return ime_ptr_.get(); }
   InputInstance* input_instance() { return input_ptr_.get(); }
   IntentHelperInstance* intent_helper_instance() {
     return intent_helper_ptr_.get();
   }
   NotificationsInstance* notifications_instance() {
     return notifications_ptr_.get();
   }
   PowerInstance* power_instance() { return power_ptr_.get(); }
   ProcessInstance* process_instance() { return process_ptr_.get(); }
-  SettingsInstance* settings_instance() { return settings_ptr_.get(); }
   VideoInstance* video_instance() { return video_ptr_.get(); }
 
   int32_t app_version() const { return app_ptr_.version(); }
   int32_t auth_version() const { return auth_ptr_.version(); }
   int32_t clipboard_version() const { return clipboard_ptr_.version(); }
   int32_t ime_version() const { return ime_ptr_.version(); }
   int32_t input_version() const { return input_ptr_.version(); }
   int32_t intent_helper_version() const { return intent_helper_ptr_.version(); }
   int32_t notifications_version() const { return notifications_ptr_.version(); }
   int32_t power_version() const { return power_ptr_.version(); }
   int32_t process_version() const { return process_ptr_.version(); }
-  int32_t settings_version() const { return settings_ptr_.version(); }
   int32_t video_version() const { return video_ptr_.version(); }
 
   // ArcHost:
   void OnAppInstanceReady(AppInstancePtr app_ptr) override;
   void OnAuthInstanceReady(AuthInstancePtr auth_ptr) override;
   void OnClipboardInstanceReady(ClipboardInstancePtr clipboard_ptr) override;
   void OnImeInstanceReady(ImeInstancePtr ime_ptr) override;
   void OnInputInstanceReady(InputInstancePtr input_ptr) override;
   void OnIntentHelperInstanceReady(
       IntentHelperInstancePtr intent_helper_ptr) override;
   void OnNotificationsInstanceReady(
       NotificationsInstancePtr notifications_ptr) override;
   void OnPowerInstanceReady(PowerInstancePtr power_ptr) override;
   void OnProcessInstanceReady(ProcessInstancePtr process_ptr) override;
-  void OnSettingsInstanceReady(SettingsInstancePtr process_ptr) override;
+  void OnSettingsInstanceReady(SettingsInstancePtr settings_ptr) override;
   void OnVideoInstanceReady(VideoInstancePtr video_ptr) override;
 
   // Gets the current state of the bridge service.
   State state() const { return state_; }
 
   // Gets if ARC is available in this system.
   bool available() const { return available_; }
 
  protected:
   ArcBridgeService();
@@ skipping 21 matching lines @@
   // Called when one of the individual channels is closed.
   void CloseAppChannel();
   void CloseAuthChannel();
   void CloseClipboardChannel();
   void CloseImeChannel();
   void CloseInputChannel();
   void CloseIntentHelperChannel();
   void CloseNotificationsChannel();
   void ClosePowerChannel();
   void CloseProcessChannel();
-  void CloseSettingsChannel();
   void CloseVideoChannel();
 
   // Callbacks for QueryVersion.
   void OnAppVersionReady(int32_t version);
   void OnAuthVersionReady(int32_t version);
   void OnClipboardVersionReady(int32_t version);
   void OnImeVersionReady(int32_t version);
   void OnInputVersionReady(int32_t version);
   void OnIntentHelperVersionReady(int32_t version);
   void OnNotificationsVersionReady(int32_t version);
   void OnPowerVersionReady(int32_t version);
   void OnProcessVersionReady(int32_t version);
-  void OnSettingsVersionReady(int32_t version);
   void OnVideoVersionReady(int32_t version);
 
   // Mojo interfaces.
   AppInstancePtr app_ptr_;
   AuthInstancePtr auth_ptr_;
   ClipboardInstancePtr clipboard_ptr_;
   ImeInstancePtr ime_ptr_;
   InputInstancePtr input_ptr_;
   IntentHelperInstancePtr intent_helper_ptr_;
   NotificationsInstancePtr notifications_ptr_;
   PowerInstancePtr power_ptr_;
   ProcessInstancePtr process_ptr_;
-  SettingsInstancePtr settings_ptr_;
   VideoInstancePtr video_ptr_;
 
   // Temporary Mojo interfaces.  After a Mojo interface pointer has been
   // received from the other endpoint, we still need to asynchronously query
   // its version.  While that is going on, we should still return nullptr on
   // the xxx_instance() functions.
   // To keep the xxx_instance() functions being trivial, store the instance
   // pointer in a temporary variable to avoid losing its reference.
   AppInstancePtr temporary_app_ptr_;
   AuthInstancePtr temporary_auth_ptr_;
   ClipboardInstancePtr temporary_clipboard_ptr_;
   ImeInstancePtr temporary_ime_ptr_;
   InputInstancePtr temporary_input_ptr_;
   IntentHelperInstancePtr temporary_intent_helper_ptr_;
   NotificationsInstancePtr temporary_notifications_ptr_;
   PowerInstancePtr temporary_power_ptr_;
   ProcessInstancePtr temporary_process_ptr_;
-  SettingsInstancePtr temporary_settings_ptr_;
   VideoInstancePtr temporary_video_ptr_;
 
   base::ObserverList<Observer> observer_list_;
 
   base::ThreadChecker thread_checker_;
 
   // If the ARC instance service is available.
   bool available_;
 
   // The current state of the bridge.
   ArcBridgeService::State state_;
 
   // WeakPtrFactory to use callbacks.
   base::WeakPtrFactory<ArcBridgeService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_