mash: Allow a subset of D-Bus clients to be created in DBusThreadManager

ash/common/system/date/date_default_view.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/common/system/date/date_default_view.h"
 
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/date/date_view.h"
 #include "ash/common/system/tray/special_popup_row.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/wm_shell.h"
 #include "base/i18n/rtl.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 #if defined(OS_CHROMEOS)
-#include "chromeos/dbus/dbus_thread_manager.h"
+#include "ash/common/dbus_thread_manager_ash.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #endif
 
 namespace {
 
 // The ISO-639 code for the Hebrew locale. The help icon asset is a '?' which is
 // not mirrored in this locale.
 const char kHebrewLocale[] = "he";
 
 const int kPaddingVertical = 19;
@@ skipping 99 matching lines @@
   SystemTrayDelegate* tray_delegate = shell->system_tray_delegate();
   if (sender == help_button_) {
     shell->RecordUserMetricsAction(UMA_TRAY_HELP);
     tray_delegate->ShowHelp();
   } else if (sender == shutdown_button_) {
     shell->RecordUserMetricsAction(UMA_TRAY_SHUT_DOWN);
     tray_delegate->RequestShutdown();
   } else if (sender == lock_button_) {
     shell->RecordUserMetricsAction(UMA_TRAY_LOCK_SCREEN);
 #if defined(OS_CHROMEOS)
-    chromeos::DBusThreadManager::Get()
+    DBusThreadManagerAsh::Get()
         ->GetSessionManagerClient()
         ->RequestLockScreen();
 #endif
   } else {
     NOTREACHED();
   }
 }
 
 void DateDefaultView::OnShutdownPolicyChanged(bool reboot_on_shutdown) {
   if (!shutdown_button_)
     return;
 
   shutdown_button_->SetTooltipText(l10n_util::GetStringUTF16(
       reboot_on_shutdown ? IDS_ASH_STATUS_TRAY_REBOOT
                          : IDS_ASH_STATUS_TRAY_SHUTDOWN));
 }
 
 }  // namespace ash