Implemented new channel switcher UI.

chromeos/dbus/update_engine_client.cc

 // Copyright (c) 2012 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 "chromeos/dbus/update_engine_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "dbus/bus.h"
@@ skipping 144 matching lines @@
         base::Bind(&UpdateEngineClientImpl::OnGetReleaseTrack,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback));
   }
 
   // UpdateEngineClient override.
   virtual Status GetLastStatus() OVERRIDE {
     return last_status_;
   }
 
+  // UpdateEngineClient override.
+  virtual void SetChannel(const std::string& target_channel,
+                          bool is_powerwash_allowed) OVERRIDE {
+    dbus::MethodCall method_call(

[Nikita (slow), 2013/06/21 12:21:33]

Check somewhere that target_channel value is valid. Switching to enum is even
better.

[ygorshenin1, 2013/06/21 17:24:58]

Done, enum constants will be added in a separate CL.

+        update_engine::kUpdateEngineInterface,
+        update_engine::kSetChannel);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(target_channel);
+    writer.AppendBool(is_powerwash_allowed);
+    VLOG(1) << "Requesting to set channel: "
+            << "target_channel=" << target_channel << ", "
+            << "is_powerwash_allowed=" << is_powerwash_allowed;
+    update_engine_proxy_->CallMethod(
+        &method_call,
+        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&UpdateEngineClientImpl::OnSetChannel,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
+
+  // UpdateEngineClient override.
+  virtual void GetChannel(bool get_current_channel,
+                          const GetChannelCallback& callback) OVERRIDE {
+    dbus::MethodCall method_call(
+        update_engine::kUpdateEngineInterface,
+        update_engine::kGetChannel);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendBool(get_current_channel);
+

[Nikita (slow), 2013/06/21 12:21:33]

nit: drop empty line

[ygorshenin1, 2013/06/21 17:24:58]

All other methods in this file have an empty line before dbus call.

On 2013/06/21 12:21:33, Nikita Kostylev wrote:

+    VLOG(1) << "Requesting to get channel, get_current_channel="
+            << get_current_channel;
+    update_engine_proxy_->CallMethod(
+        &method_call,
+        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&UpdateEngineClientImpl::OnGetChannel,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   callback));
+  }
+
  private:
   void GetUpdateEngineStatus() {
     dbus::MethodCall method_call(
         update_engine::kUpdateEngineInterface,
         update_engine::kGetStatus);
     update_engine_proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&UpdateEngineClientImpl::OnGetStatus,
                    weak_ptr_factory_.GetWeakPtr()),
@@ skipping 69 matching lines @@
     status.status = UpdateStatusFromString(current_operation);
     last_status_ = status;
     FOR_EACH_OBSERVER(Observer, observers_, UpdateStatusChanged(status));
   }
 
   // Called when GetStatus call failed.
   void OnGetStatusError(dbus::ErrorResponse* error) {
     LOG(ERROR) << "GetStatus request failed with error: " << error->ToString();
   }
 
+    // Called when a response for SetReleaseTrack() is received.
+  void OnSetChannel(dbus::Response* response) {
+    if (!response) {
+      LOG(ERROR) << "Failed to request setting channel";
+      return;
+    }
+    LOG(ERROR) << "Succeeded to set channel";
+  }
+
+  // Called when a response for GetChannel() is received.
+  void OnGetChannel(const GetReleaseTrackCallback& callback,
+                    dbus::Response* response) {
+    if (!response) {
+      LOG(ERROR) << "Failed to request getting channel";
+      callback.Run("");
+      return;
+    }
+    dbus::MessageReader reader(response);
+    std::string channel;
+    if (!reader.PopString(&channel)) {
+      LOG(ERROR) << "Incorrect response: " << response->ToString();
+      callback.Run("");
+      return;
+    }
+    VLOG(1) << "The channel received: " << channel;
+    callback.Run(channel);
+  }
+
   // Called when a status update signal is received.
   void StatusUpdateReceived(dbus::Signal* signal) {
     VLOG(1) << "Status update signal received: " << signal->ToString();
     dbus::MessageReader reader(signal);
     int64 last_checked_time = 0;
     double progress = 0.0;
     std::string current_operation;
     std::string new_version;
     int64_t new_size = 0;
     if (!(reader.PopInt64(&last_checked_time) &&
@@ skipping 47 matching lines @@
       const UpdateCheckCallback& callback) OVERRIDE {
     callback.Run(UPDATE_RESULT_NOTIMPLEMENTED);
   }
   virtual void RebootAfterUpdate() OVERRIDE {}
   virtual void SetReleaseTrack(const std::string& track) OVERRIDE {}
   virtual void GetReleaseTrack(
       const GetReleaseTrackCallback& callback) OVERRIDE {
     callback.Run("beta-channel");
   }
   virtual Status GetLastStatus() OVERRIDE { return Status(); }
+  virtual void SetChannel(const std::string& target_channel,
+                          bool is_powerwash_allowed) OVERRIDE {
+    LOG(ERROR) << "Requesting to set channel: "

[Nikita (slow), 2013/06/21 12:21:33]

LOG(INFO)?

[ygorshenin1, 2013/06/21 17:24:59]

Done.

+               << "target_channel=" << target_channel << ", "
+               << "is_powerwash_allowed=" << is_powerwash_allowed;
+  }
+  virtual void GetChannel(bool get_current_channel,
+                          const GetChannelCallback& callback) OVERRIDE {
+    LOG(ERROR) << "Requesting to get channel, get_current_channel="

[Nikita (slow), 2013/06/21 12:21:33]

LOG(INFO)?

[ygorshenin1, 2013/06/21 17:24:59]

Done.

+               << get_current_channel;
+    callback.Run("beta-channel");
+  }
 };
 
 UpdateEngineClient::UpdateEngineClient() {
 }
 
 UpdateEngineClient::~UpdateEngineClient() {
 }
 
 // static
 UpdateEngineClient::UpdateCheckCallback
 UpdateEngineClient::EmptyUpdateCheckCallback() {
   return base::Bind(&EmptyUpdateCheckCallbackBody);
 }
 
 // static
 UpdateEngineClient* UpdateEngineClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new UpdateEngineClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new UpdateEngineClientStubImpl();
 }
 
 }  // namespace chromeos