Decouple EventClientImpl and root window. Check containers on the same root window as focused windo…

ash/accelerators/accelerator_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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 15 matching lines @@
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness/brightness_control_delegate.h"
 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/partial_screenshot_view.h"
+#include "ash/wm/power_button_controller.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/screen.h"
 #include "ui/oak/oak.h"
 #include "ui/views/debug_utils.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/output_configurator_animation.h"
 #include "base/chromeos/chromeos_version.h"
+#include "base/time.h"
 #include "chromeos/display/output_configurator.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 namespace {
 
 // Factor of magnification scale. For example, when this value is 1.189, scale
 // value will be changed x1.000, x1.189, x1.414, x1.681, x2.000, ...
 // Note: this value is 2.0 ^ (1 / 4).
 const float kMagnificationFactor = 1.18920712f;
@@ skipping 684 matching lines @@
     case MAGNIFY_SCREEN_ZOOM_IN:
       return HandleMagnifyScreen(1);
     case MAGNIFY_SCREEN_ZOOM_OUT:
       return HandleMagnifyScreen(-1);
     case MEDIA_NEXT_TRACK:
       return HandleMediaNextTrack();
     case MEDIA_PLAY_PAUSE:
        return HandleMediaPlayPause();
     case MEDIA_PREV_TRACK:
        return HandleMediaPrevTrack();
-    case POWER_PRESSED:  // fallthrough
+    case POWER_PRESSED:

[Daniel Erat, 2012/10/06 14:01:20]

i think that i'd rather that you made separate LOCK_PRESSED and LOCK_RELEASED
actions here instead of using POWER_PRESSED/_RELEASED

[oshima, 2012/10/06 17:20:58]

I added shutdown as well. I prefer to keep this assigned to
the same key because it's consistent with the device, but
can assign different key if you prefer that way.
Please let me know.

[Daniel Erat, 2012/10/07 13:40:02]

I don't understand the "consistent with the device" comment.  On devices, we
have different keys for the power button and the lock button.  Neither of them
goes through this path; we get D-Bus signals from powerm when either key is
pressed or released.

What I'd suggesting is something like:

- add LOCK_PRESSED and LOCK_RELEASED, make them call LockButtonEvent, and make
them get triggered by F11 in debug builds
- make POWER_PRESSED and POWER_RELEASED just call OnPowerButtonEvent, and make
them get triggered by F12 in debug builds

Calling either OnPowerButtonEvent or OnLockButtonEvent for the same key isn't
consistent with how the real code works -- the real code either locks or shuts
down in response to power button presses depending on whether we're not locked
or are locked, and only locks in response to lock button presses.

     case POWER_RELEASED:
-       // We don't do anything with these at present, but we consume them to
-       // prevent them from getting passed to apps -- see
-       // http://crbug.com/146609.
+      // We don't do anything with these at present on the device, but
+      // we consume them to prevent them from getting passed to apps
+      // -- see http://crbug.com/146609.

[Daniel Erat, 2012/10/06 14:00:19]

this comment needs to be updated

[oshima, 2012/10/06 17:20:58]

This was actually updated, but probably not clear enough.
I moved & added extra comment.

+#if defined(OS_CHROMEOS)
+      if (!base::chromeos::IsRunningOnChromeOS()) {
+        Shell::GetInstance()->power_button_controller()->
+            OnLockButtonEvent(action == POWER_PRESSED, base::TimeTicks());
+      }
+#endif
        return true;
 #if !defined(NDEBUG)
     case PRINT_LAYER_HIERARCHY:
       return HandlePrintLayerHierarchy();
     case PRINT_VIEW_HIERARCHY:
       return HandlePrintViewHierarchy();
     case PRINT_WINDOW_HIERARCHY:
       return HandlePrintWindowHierarchy();
 #endif
     default:
@@ skipping 82 matching lines @@
     accelerators_.insert(
         std::make_pair(accelerator, accelerators[i].action));
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash