mash: Convert system tray logout button to wm common types

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index e8ac49c5adc7ed8e2a674f66f0b4f53684b5ea75..56652b3fe1e0819f1478294b030a57d180970a76 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -130,7 +130,15 @@
       'common/system/chromeos/screen_security/screen_share_observer.h',
       'common/system/chromeos/session/last_window_closed_observer.h',
       'common/system/chromeos/session/logout_button_observer.h',
+      'common/system/chromeos/session/logout_button_tray.cc',
+      'common/system/chromeos/session/logout_button_tray.h',
+      'common/system/chromeos/session/logout_confirmation_controller.cc',
+      'common/system/chromeos/session/logout_confirmation_controller.h',
+      'common/system/chromeos/session/logout_confirmation_dialog.cc',
+      'common/system/chromeos/session/logout_confirmation_dialog.h',
       'common/system/chromeos/session/session_length_limit_observer.h',
+      'common/system/chromeos/session/tray_session_length_limit.cc',
+      'common/system/chromeos/session/tray_session_length_limit.h',
       'common/system/chromeos/settings/tray_settings.cc',
       'common/system/chromeos/settings/tray_settings.h',
       'common/system/chromeos/shutdown_policy_observer.h',
@@ -166,6 +174,8 @@
       'common/system/tray/fixed_sized_scroll_view.h',
       'common/system/tray/hover_highlight_view.cc',
       'common/system/tray/hover_highlight_view.h',
+      'common/system/tray/label_tray_view.cc',
+      'common/system/tray/label_tray_view.h',
       'common/system/tray/special_popup_row.cc',
       'common/system/tray/special_popup_row.h',
       'common/system/tray/system_tray_bubble.cc',
@@ -562,8 +572,6 @@
       'system/chromeos/enterprise/tray_enterprise.h',
       'system/chromeos/keyboard_brightness_controller.cc',
       'system/chromeos/keyboard_brightness_controller.h',
-      'system/chromeos/label_tray_view.cc',
-      'system/chromeos/label_tray_view.h',
       'system/chromeos/media_security/multi_profile_media_tray_item.cc',
       'system/chromeos/media_security/multi_profile_media_tray_item.h',
       'system/chromeos/multi_user/user_switch_util.cc',
@@ -595,16 +603,6 @@
       'system/chromeos/screen_security/screen_share_tray_item.h',
       'system/chromeos/screen_security/screen_tray_item.cc',
       'system/chromeos/screen_security/screen_tray_item.h',
-      'system/chromeos/session/last_window_closed_logout_reminder.cc',
-      'system/chromeos/session/last_window_closed_logout_reminder.h',
-      'system/chromeos/session/logout_button_tray.cc',
-      'system/chromeos/session/logout_button_tray.h',
-      'system/chromeos/session/logout_confirmation_controller.cc',
-      'system/chromeos/session/logout_confirmation_controller.h',
-      'system/chromeos/session/logout_confirmation_dialog.cc',
-      'system/chromeos/session/logout_confirmation_dialog.h',
-      'system/chromeos/session/tray_session_length_limit.cc',
-      'system/chromeos/session/tray_session_length_limit.h',
       'system/chromeos/supervised/custodian_info_tray_observer.h',
       'system/chromeos/supervised/tray_supervised_user.cc',
       'system/chromeos/supervised/tray_supervised_user.h',
@@ -901,6 +899,8 @@
       'common/system/chromeos/power/power_status_unittest.cc',
       'common/system/chromeos/power/power_status_view_unittest.cc',
       'common/system/chromeos/power/tray_power_unittest.cc',
+      'common/system/chromeos/session/logout_confirmation_controller_unittest.cc',
+      'common/system/chromeos/session/tray_session_length_limit_unittest.cc',
       'common/system/date/date_view_unittest.cc',
       'common/system/ime/tray_ime_chromeos_unittest.cc',
       'common/system/tray/tray_details_view_unittest.cc',
@@ -964,8 +964,6 @@
       'system/chromeos/power/power_event_observer_unittest.cc',
       'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
       'system/chromeos/screen_security/screen_tray_item_unittest.cc',
-      'system/chromeos/session/logout_confirmation_controller_unittest.cc',
-      'system/chromeos/session/tray_session_length_limit_unittest.cc',
       'system/chromeos/supervised/tray_supervised_user_unittest.cc',
       'system/chromeos/tray_display_unittest.cc',
       'system/overview/overview_button_tray_unittest.cc',