chromeos: Combine TrayAudio and TrayAudioChromeOs classes

ash/wm/power_button_controller.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 "ash/wm/power_button_controller.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
-#include "ash/common/system/audio/tray_audio.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/events/event_handler.h"
 #include "ui/wm/core/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/common/system/chromeos/audio/tray_audio.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 namespace ash {
 
 PowerButtonController::PowerButtonController(LockStateController* controller)
     : power_button_down_(false),
       lock_button_down_(false),
       volume_down_pressed_(false),
@@ skipping 40 matching lines @@
 
   if (controller_->ShutdownRequested())
     return;
 
   // Avoid starting the lock/shutdown sequence if the power button is pressed
   // while the screen is off (http://crbug.com/128451), unless an external
   // display is still on (http://crosbug.com/p/24912).
   if (brightness_is_zero_ && !internal_display_off_and_external_display_on_)
     return;
 
+#if defined(OS_CHROMEOS)
+  // Take screenshot on power button down plus volume down when in touch view.
   if (volume_down_pressed_ && down &&
       WmShell::Get()
           ->maximize_mode_controller()
           ->IsMaximizeModeWindowManagerEnabled()) {
     SystemTray* system_tray = Shell::GetInstance()->GetPrimarySystemTray();
     if (system_tray && system_tray->GetTrayAudio())
       system_tray->GetTrayAudio()->HideDetailedView(false);
 
     WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
         TAKE_SCREENSHOT);
 
-#if defined(OS_CHROMEOS)
     // Restore volume.
     chromeos::CrasAudioHandler* audio_handler =
         chromeos::CrasAudioHandler::Get();
     audio_handler->SetOutputVolumePercentWithoutNotifyingObservers(
         volume_percent_before_screenshot_,
         chromeos::CrasAudioHandler::VOLUME_CHANGE_MAXIMIZE_MODE_SCREENSHOT);
-#endif
     return;
   }
+#endif  // defined(OS_CHROMEOS)
 
   const SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   if (has_legacy_power_button_) {
     // If power button releases won't get reported correctly because we're not
     // running on official hardware, just lock the screen or shut down
     // immediately.
     if (down) {
       if (session_state_delegate->CanLockScreen() &&
           !session_state_delegate->IsUserSessionBlocked() &&
@@ skipping 85 matching lines @@
 }
 
 void PowerButtonController::PowerButtonEventReceived(
     bool down,
     const base::TimeTicks& timestamp) {
   OnPowerButtonEvent(down, timestamp);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash