Support transition between chrome and user mode console

chrome/browser/chromeos/dbus/console_service_provider.cc

+// Copyright 2014 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 "ash/shell.h"
+#include "chrome/browser/chromeos/dbus/console_service_provider.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+#include "ui/display/chromeos/display_configurator.h"
+
+namespace chromeos {
+
+ConsoleServiceProvider::ConsoleServiceProvider() : weak_ptr_factory_(this) {
+}
+
+ConsoleServiceProvider::~ConsoleServiceProvider() {
+}
+
+void ConsoleServiceProvider::Start(
+    scoped_refptr<dbus::ExportedObject> exported_object) {
+  exported_object->ExportMethod(
+      kLibCrosServiceInterface, kActivateConsole,
+      base::Bind(&ConsoleServiceProvider::ActivateConsole,
+                 weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&ConsoleServiceProvider::OnExported,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void ConsoleServiceProvider::ActivateConsole(
+    dbus::MethodCall* method_call,
+    dbus::ExportedObject::ResponseSender response_sender) {
+  dbus::MessageReader reader(method_call);
+  bool release_display;
+  if (reader.PopBool(&release_display)) {
+    ui::DisplayConfigurator* display_configurator =
+        ash::Shell::GetInstance()->display_configurator();
+    if (release_display)
+      display_configurator->RelinquishControl();
+    else

[Daniel Erat, 2014/11/02 13:48:34]

nit: you need curly brackets for the if/else now that the SetDisplayMode call
wraps (but see below naming suggestion that would bring it back to a single
line)

[dsodman, 2014/11/04 05:19:40]

Done.

+      display_configurator->SetDisplayMode(
+          display_configurator->display_state());

[Daniel Erat, 2014/11/02 13:48:34]

asking it to set the display to the already-current mode seems risky; i could
easily see someone optimizing this to be a no-op in the future. how about adding
a TakeControl() method to match the RelinquishControl() method you call above?

[dsodman, 2014/11/04 05:19:40]

Done.

+  } else {
+    LOG(ERROR) << "Unable to parse " << kActivateConsole << " request";
+  }
+
+  response_sender.Run(dbus::Response::FromMethodCall(method_call));
+}
+
+void ConsoleServiceProvider::OnExported(const std::string& interface_name,
+                                        const std::string& method_name,
+                                        bool success) {
+  if (!success)
+    LOG(ERROR) << "failed to export " << interface_name << "." << method_name;
+}
+
+}  // namespace chromeos