ash/chromeos: Add shift-alt-p shortcut to open palette.

ash/accelerators/accelerator_controller_delegate_aura.cc

 // Copyright 2016 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_delegate_aura.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <utility>
@@ skipping 50 matching lines @@
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/common/palette_delegate.h"

[James Cook, 2016/08/26 01:05:51]

Since this code is in ash/common you should be able to put code from this file
in ash/common/accelerators/accelerator_controller.cc

You'll want to use WmShell::Get()->GetRootWindowForNewWindows() instead of
GetTargetRootWindow().

[jdufault, 2016/08/26 02:44:56]

Done.

+#include "ash/common/system/chromeos/palette/palette_tray.h"
+#include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/display/display_configuration_controller.h"
 #include "base/sys_info.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 namespace {
 
 using base::UserMetricsAction;
 
 // The notification delegate that will be used to open the keyboard shortcut
@@ skipping 233 matching lines @@
       break;
   }
 }
 
 bool CanHandleUnpin() {
   wm::WindowState* window_state = wm::GetActiveWindowState();
   return window_state && window_state->IsPinned();
 }
 
 #if defined(OS_CHROMEOS)
+bool CanHandleShowStylusTools() {
+  RootWindowController* controller =
+      RootWindowController::ForTargetRootWindow();
+  StatusAreaWidget* status_area_widget =
+      controller->shelf_widget()->status_area_widget();
+  return status_area_widget && ash::IsPaletteFeatureEnabled() &&

[James Cook, 2016/08/26 01:05:51]

nit: StatusAreaWidget is created in the SHelfWidget constructor, so there should
always be a status_area_widget, I don't think you need the if() condition.

nit: no ash::

[jdufault, 2016/08/26 02:44:56]

Done.

+         WmShell::Get()->palette_delegate()->ShouldShowPalette();
+}
+
+void HandleShowStylusTools() {
+  base::RecordAction(UserMetricsAction("Accel_Show_Stylus_Tools"));
+  RootWindowController* controller =
+      RootWindowController::ForTargetRootWindow();
+  StatusAreaWidget* status_area_widget =
+      controller->shelf_widget()->status_area_widget();
+  if (status_area_widget) {

[James Cook, 2016/08/26 01:05:51]

ditto

[jdufault, 2016/08/26 02:44:56]

Done.

+    PaletteTray* palette_tray = status_area_widget->palette_tray();
+    palette_tray->OpenBubble();
+  }
+}
+
 void HandleSwapPrimaryDisplay() {
   base::RecordAction(UserMetricsAction("Accel_Swap_Primary_Display"));
   Shell::GetInstance()->display_configuration_controller()->SetPrimaryDisplayId(
       ScreenUtil::GetSecondaryDisplay().id(), true /* user_action */);
 }
 
 void HandleToggleMirrorMode() {
   base::RecordAction(UserMetricsAction("Accel_Toggle_Mirror_Mode"));
   bool mirror = !Shell::GetInstance()->display_manager()->IsInMirrorMode();
   Shell::GetInstance()->display_configuration_controller()->SetMirrorMode(
@@ skipping 62 matching lines @@
       return true;
 
 #if defined(OS_CHROMEOS)
     case DEBUG_ADD_REMOVE_DISPLAY:
     case DEBUG_TOGGLE_UNIFIED_DESKTOP:
     case DISABLE_GPU_WATCHDOG:
     case LOCK_PRESSED:
     case LOCK_RELEASED:
     case POWER_PRESSED:
     case POWER_RELEASED:
+    case SHOW_STYLUS_TOOLS:
     case SWAP_PRIMARY_DISPLAY:
     case TOGGLE_MIRROR_MODE:
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
     case TOUCH_HUD_PROJECTION_TOGGLE:
       return true;
 #endif
 
     default:
       break;
@@ skipping 42 matching lines @@
     case TAKE_PARTIAL_SCREENSHOT:
     case TAKE_SCREENSHOT:
     case TAKE_WINDOW_SCREENSHOT:
       return true;
 
 #if defined(OS_CHROMEOS)
     case DEBUG_ADD_REMOVE_DISPLAY:
     case DEBUG_TOGGLE_UNIFIED_DESKTOP:
       return debug::DebugAcceleratorsEnabled();
 
+    case SHOW_STYLUS_TOOLS:
+      return CanHandleShowStylusTools();
     case SWAP_PRIMARY_DISPLAY:
       return display::Screen::GetScreen()->GetNumDisplays() > 1;
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
       return CanHandleTouchHud();
 
     // Following are always enabled.
     case DISABLE_GPU_WATCHDOG:
     case LOCK_PRESSED:
     case LOCK_RELEASED:
@@ skipping 124 matching lines @@
         // There is no powerd, the Chrome OS power manager, in linux desktop,
         // so call the PowerButtonController here.
         Shell::GetInstance()->power_button_controller()->OnPowerButtonEvent(
             action == POWER_PRESSED, base::TimeTicks());
       }
       // We don't do anything with these at present on the device,
       // (power button events are reported to us from powerm via
       // D-BUS), but we consume them to prevent them from getting
       // passed to apps -- see http://crbug.com/146609.
       break;
+    case SHOW_STYLUS_TOOLS:
+      HandleShowStylusTools();
+      break;
     case SWAP_PRIMARY_DISPLAY:
       HandleSwapPrimaryDisplay();
       break;
     case TOGGLE_MIRROR_MODE:
       HandleToggleMirrorMode();
       break;
     case TOUCH_HUD_CLEAR:
       HandleTouchHudClear();
       break;
     case TOUCH_HUD_MODE_CHANGE:
@@ skipping 24 matching lines @@
           message_center::NotifierId(
               message_center::NotifierId::SYSTEM_COMPONENT,
               system_notifier::kNotifierDeprecatedAccelerator),
           message_center::RichNotificationData(),
           new DeprecatedAcceleratorNotificationDelegate));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 }  // namespace ash