Enabled volume buttons when TouchView is active

ash/wm/maximize_mode/maximize_mode_event_blocker.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/wm/maximize_mode/maximize_mode_event_blocker.h"
 
 #include "ash/shell.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/events/event_targeter.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"

[flackr, 2014/04/29 21:43:54]

This is only for posix OS's, include "ui/events/keycodes/keyboard_codes.h" which
will bring in the right keycodes file for the OS.

[bruthig, 2014/04/30 14:04:45]

Done.

 
 namespace ash {
 
 namespace {
 
 // Event targeter to prevent delivery of mouse and touchpad events while
 // maximize mode is active. Other events such as touch are passed on to the
 // default targeter.
 // TODO(flackr): This should only stop events from the internal keyboard and
 // touchpad.
@@ skipping 26 matching lines @@
 }
 
 void BlockKeyboardAndTouchpadTargeter::SetDefaultTargeter(
     ui::EventTargeter* default_targeter) {
   default_targeter_ = default_targeter;
 }
 
 ui::EventTarget* BlockKeyboardAndTouchpadTargeter::FindTargetForEvent(
     ui::EventTarget* root,
     ui::Event* event) {
-  if (event->HasNativeEvent() && (event->IsMouseEvent() || event->IsKeyEvent()))
-    return NULL;
+  if (event->HasNativeEvent()) {
+    if (event->IsMouseEvent())
+      return NULL;
+    if (event->IsKeyEvent()) {
+      // TODO(bruthig): This is a partial fix to issue 364584.

[flackr, 2014/04/29 21:43:54]

nit: use a link to the issue, i.e. http://crbug.com/364584. Also, generally the
first line of the todo should be what there is to do. I.e. TODO(bruthig): Don't
allow remapped volume function keys (i.e. F9, F10) in maximized mode, only
physical volume media keys, http://crbug.com/364584.

[flackr, 2014/04/29 21:49:24]

Also, if you're planning on closing the main bug, then create a new bug for this
special case and reference it here.

[bruthig, 2014/04/30 14:04:45]

Done.

[bruthig, 2014/04/30 14:04:45]

Done.

+      // This fix enables all volume up & down events including those
+      // originating from the keyboard.  This needs to be fixed to only allow
+      // events originating from hard buttons and filtering out those coming
+      // from the keyboard but this requires some work to the Event system
+      // so that we can distinguish between the two events at this level.
+      ui::KeyEvent* keyEvent = static_cast<ui::KeyEvent*>(event);

[flackr, 2014/04/29 21:43:54]

s/keyEvent/key_event
i.e. unix_hacker_style names for local variables.

[bruthig, 2014/04/30 14:04:45]

Done.

+      if (keyEvent->key_code() != ui::VKEY_VOLUME_DOWN &&
+          keyEvent->key_code() != ui::VKEY_VOLUME_UP) {
+        return NULL;
+      }
+    }
+  }
   return default_targeter_->FindTargetForEvent(root, event);
 }
 
 }  // namespace
 
 MaximizeModeEventBlocker::MaximizeModeEventBlocker() {
   Shell::GetInstance()->AddShellObserver(this);
 
   // Hide the cursor as mouse events will be blocked.
   aura::client::CursorClient* cursor_client_ =
@@ skipping 22 matching lines @@
     aura::Window* root_window) {
   BlockKeyboardAndTouchpadTargeter* targeter =
       new BlockKeyboardAndTouchpadTargeter();
   aura::ScopedWindowTargeter* scoped_targeter = new aura::ScopedWindowTargeter(
       root_window, scoped_ptr<ui::EventTargeter>(targeter));
   targeter->SetDefaultTargeter(scoped_targeter->old_targeter());
   targeters_.push_back(scoped_targeter);
 }
 
 }  // namespace ash