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

components/arc/arc_bridge_service.cc

 // 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.
 
 #include "components/arc/arc_bridge_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 51 matching lines @@
   if (ime_instance())
     observer->OnImeInstanceReady();
   if (input_instance())
     observer->OnInputInstanceReady();
   if (notifications_instance())
     observer->OnNotificationsInstanceReady();
   if (power_instance())
     observer->OnPowerInstanceReady();
   if (process_instance())
     observer->OnProcessInstanceReady();
-  if (settings_instance())
-    observer->OnSettingsInstanceReady();
   if (video_instance())
     observer->OnVideoInstanceReady();
 }
 
 void ArcBridgeService::RemoveObserver(Observer* observer) {
   DCHECK(CalledOnValidThread());
   observer_list_.RemoveObserver(observer);
 }
 
 void ArcBridgeService::OnAppInstanceReady(AppInstancePtr app_ptr) {
@@ skipping 213 matching lines @@
   DCHECK(CalledOnValidThread());
   if (!process_ptr_)
     return;
 
   process_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceClosed());
 }
 
 void ArcBridgeService::OnSettingsInstanceReady(
     SettingsInstancePtr settings_ptr) {
-  DCHECK(CalledOnValidThread());
-  temporary_settings_ptr_ = std::move(settings_ptr);
-  temporary_settings_ptr_.QueryVersion(base::Bind(
-      &ArcBridgeService::OnSettingsVersionReady, weak_factory_.GetWeakPtr()));
-}
-
-void ArcBridgeService::OnSettingsVersionReady(int32_t version) {
-  DCHECK(CalledOnValidThread());
-  settings_ptr_ = std::move(temporary_settings_ptr_);
-  settings_ptr_.set_connection_error_handler(base::Bind(
-      &ArcBridgeService::CloseSettingsChannel, weak_factory_.GetWeakPtr()));
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnSettingsInstanceReady());
-}
-
-void ArcBridgeService::CloseSettingsChannel() {
-  DCHECK(CalledOnValidThread());
-  if (!settings_ptr_)
-    return;
-
-  settings_ptr_.reset();
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnSettingsInstanceClosed());
+  // Obsolete interface.
 }
 
 void ArcBridgeService::OnVideoInstanceReady(VideoInstancePtr video_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_video_ptr_ = std::move(video_ptr);
   temporary_video_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnVideoVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnVideoVersionReady(int32_t version) {
@@ skipping 37 matching lines @@
   // and notify any observers that the channel is closed.
   CloseAppChannel();
   CloseAuthChannel();
   CloseClipboardChannel();
   CloseImeChannel();
   CloseInputChannel();
   CloseIntentHelperChannel();
   CloseNotificationsChannel();
   ClosePowerChannel();
   CloseProcessChannel();
-  CloseSettingsChannel();
   CloseVideoChannel();
 }
 
 }  // namespace arc