Support transition between chrome and user mode console

chromeos/dbus/dbus_client_bundle.h

Index: chromeos/dbus/dbus_client_bundle.h
diff --git a/chromeos/dbus/dbus_client_bundle.h b/chromeos/dbus/dbus_client_bundle.h
index 8be99983acba4b912ab385446302d1dbc3c54bbf..22f112c3d9213fb7be182f76543888879437f041 100644
--- a/chromeos/dbus/dbus_client_bundle.h
+++ b/chromeos/dbus/dbus_client_bundle.h
@@ -19,6 +19,7 @@ class BluetoothGattManagerClient;
 class BluetoothGattServiceClient;
 class BluetoothInputClient;
 class BluetoothProfileManagerClient;
+class ConsoleServiceClient;
 class CrasAudioClient;
 class CrosDisksClient;
 class CryptohomeClient;
@@ -56,26 +57,27 @@ class CHROMEOS_EXPORT DBusClientBundle {
   // TODO(zelidrag): We might want to collapse few more of these subsystems if
   // their dbus interfaced correspond to the same daemon.
   enum DBusClientType {
-    NO_CLIENT =            0,
-    BLUETOOTH  =           1 << 0,
-    CRAS =                 1 << 1,
-    CROS_DISKS =           1 << 2,
-    CRYPTOHOME =           1 << 3,
-    DEBUG_DAEMON =         1 << 4,
-    EASY_UNLOCK =          1 << 5,
-    LORGNETTE_MANAGER =    1 << 6,
-    SHILL =                1 << 7,
-    GSM_SMS =              1 << 8,
-    IMAGE_BURNER =         1 << 9,
-    INTROSPECTABLE =       1 << 10,
-    MODEM_MESSAGING =      1 << 11,
-    NFC =                  1 << 12,
-    PERMISSION_BROKER =    1 << 13,
-    POWER_MANAGER =        1 << 14,
-    SESSION_MANAGER =      1 << 15,
-    SMS =                  1 << 16,
-    SYSTEM_CLOCK =         1 << 17,
-    UPDATE_ENGINE =        1 << 18,
+    NO_CLIENT = 0,
+    BLUETOOTH = 1 << 0,
+    CRAS = 1 << 1,
+    CROS_DISKS = 1 << 2,
+    CRYPTOHOME = 1 << 3,
+    DEBUG_DAEMON = 1 << 4,
+    EASY_UNLOCK = 1 << 5,
+    LORGNETTE_MANAGER = 1 << 6,
+    SHILL = 1 << 7,
+    GSM_SMS = 1 << 8,
+    IMAGE_BURNER = 1 << 9,
+    INTROSPECTABLE = 1 << 10,
+    MODEM_MESSAGING = 1 << 11,
+    NFC = 1 << 12,
+    PERMISSION_BROKER = 1 << 13,
+    POWER_MANAGER = 1 << 14,
+    SESSION_MANAGER = 1 << 15,
+    SMS = 1 << 16,
+    SYSTEM_CLOCK = 1 << 17,
+    UPDATE_ENGINE = 1 << 18,
+    CONSOLE = 1 << 19,
   };
 
   explicit DBusClientBundle(DBusClientTypeMask unstub_client_mask);
@@ -134,6 +136,10 @@ class CHROMEOS_EXPORT DBusClientBundle {
     return cras_audio_client_.get();
   }
 
+  ConsoleServiceClient* console_service_client() {
+    return console_service_client_.get();
+  }
+
   CrosDisksClient* cros_disks_client() {
     return cros_disks_client_.get();
   }
@@ -252,6 +258,7 @@ class CHROMEOS_EXPORT DBusClientBundle {
   scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
   scoped_ptr<BluetoothProfileManagerClient> bluetooth_profile_manager_client_;
   scoped_ptr<CrasAudioClient> cras_audio_client_;
+  scoped_ptr<ConsoleServiceClient> console_service_client_;
   scoped_ptr<CrosDisksClient> cros_disks_client_;
   scoped_ptr<CryptohomeClient> cryptohome_client_;
   scoped_ptr<DebugDaemonClient> debug_daemon_client_;