Fix Volume slider is captured in screenshot done in touchview mode

ash/wm/power_button_controller.cc

Index: ash/wm/power_button_controller.cc
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index 73c686a403a69604803a88b1728c503c1bbe8d84..4f89310b60ea4e0a67762a6a2c9da4c3b53b6dbd 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -8,6 +8,7 @@
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
@@ -20,6 +21,7 @@
 #include "ui/wm/core/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
+#include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
@@ -29,6 +31,9 @@ PowerButtonController::PowerButtonController(LockStateController* controller)
     : power_button_down_(false),
       lock_button_down_(false),
       volume_down_pressed_(false),
+#if defined(OS_CHROMEOS)
+      volume_percent_before_screenshot_(0),
+#endif
       brightness_is_zero_(false),
       internal_display_off_and_external_display_on_(false),
       has_legacy_power_button_(
@@ -80,8 +85,19 @@ void PowerButtonController::OnPowerButtonEvent(
       WmShell::Get()
           ->maximize_mode_controller()
           ->IsMaximizeModeWindowManagerEnabled()) {
-    WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
-        TAKE_SCREENSHOT);
+    // Notify that maximize mode screenshot is going to be taken. Receiver does
+    // preparation work.
+    WmShell* wm_shell = WmShell::Get();
+    wm_shell->system_tray_notifier()->NotifyTakingScreenshotInMaximizeMode();

[James Cook, 2016/08/01 16:51:46]

This is fine.

+    wm_shell->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_);
+#endif
     return;
   }
 
@@ -151,8 +167,17 @@ void PowerButtonController::OnLockButtonEvent(
 }
 
 void PowerButtonController::OnKeyEvent(ui::KeyEvent* event) {
-  if (event->key_code() == ui::VKEY_VOLUME_DOWN)
+  if (event->key_code() == ui::VKEY_VOLUME_DOWN) {
     volume_down_pressed_ = event->type() == ui::ET_KEY_PRESSED;
+#if defined(OS_CHROMEOS)
+    if (!event->is_repeat()) {
+      chromeos::CrasAudioHandler* audio_handler =
+          chromeos::CrasAudioHandler::Get();
+      volume_percent_before_screenshot_ =
+          audio_handler->GetOutputVolumePercent();
+    }
+#endif
+  }
 }
 
 #if defined(OS_CHROMEOS)