Support Compat mode inside of the desktop tree.

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 61 matching lines @@
 #include "base/sys_info.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 namespace {
 
 using base::UserMetricsAction;
 
-bool CanHandleAccessibleFocusCycle() {
-  if (!Shell::GetInstance()->accessibility_delegate()->
-      IsSpokenFeedbackEnabled()) {
-    return false;
-  }
-  aura::Window* active_window = ash::wm::GetActiveWindow();
-  if (!active_window)
-    return false;
-  views::Widget* widget =
-      views::Widget::GetWidgetForNativeWindow(active_window);
-  if (!widget)
-    return false;
-  views::FocusManager* focus_manager = widget->GetFocusManager();
-  if (!focus_manager)
-    return false;
-  views::View* view = focus_manager->GetFocusedView();
-  return view && strcmp(view->GetClassName(), views::WebView::kViewClassName);
+inline ui::Accelerator CreateAccelerator(ui::KeyboardCode keycode,

[oshima, 2015/06/24 22:14:33]

remove "inline"

[David Tseng, 2015/06/24 22:24:27]

Acknowledged.

+                                         int modifiers,
+                                         bool trigger_on_press) {
+  ui::Accelerator accelerator(keycode, modifiers);
+  accelerator.set_type(trigger_on_press ? ui::ET_KEY_PRESSED
+                                        : ui::ET_KEY_RELEASED);
+  return accelerator;
 }
 
-void HandleAccessibleFocusCycle(bool reverse) {
-  if (reverse)
-    base::RecordAction(UserMetricsAction("Accel_Accessible_Focus_Previous"));
-  else
-    base::RecordAction(UserMetricsAction("Accel_Accessible_Focus_Next"));
+void ShowDeprecatedAcceleratorNotification(int message_id) {
+  const base::string16 message = l10n_util::GetStringUTF16(message_id);
+  scoped_ptr<message_center::Notification> notification(
+      new message_center::Notification(
+          message_center::NOTIFICATION_TYPE_SIMPLE,
+          kDeprecatedAcceleratorNotificationId, base::string16(), message,
+          gfx::Image(), base::string16(),
+          message_center::NotifierId(
+              message_center::NotifierId::SYSTEM_COMPONENT,
+              system_notifier::kNotifierDeprecatedAccelerator),
+          message_center::RichNotificationData(), nullptr));
+  message_center::MessageCenter::Get()->AddNotification(notification.Pass());
+}

[oshima, 2015/06/24 22:14:33]

These changes were reverted yesterday
(https://codereview.chromium.org/1202923002).

Can you sync again?

[David Tseng, 2015/06/24 22:24:27]

Done.

 
-  aura::Window* active_window = ash::wm::GetActiveWindow();
-  views::Widget* widget =
-      views::Widget::GetWidgetForNativeWindow(active_window);
-  widget->GetFocusManager()->AdvanceFocus(reverse);
+void RecordUmaHistogram(const char* histogram_name,
+                        DeprecatedAcceleratorUsage sample) {
+  auto histogram = base::LinearHistogram::FactoryGet(
+      histogram_name, 1, DEPRECATED_USAGE_COUNT, DEPRECATED_USAGE_COUNT + 1,
+      base::HistogramBase::kUmaTargetedHistogramFlag);
+  histogram->Add(sample);
 }
 
 void HandleCycleBackwardMRU(const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_TAB)
     base::RecordAction(base::UserMetricsAction("Accel_PrevWindow_Tab"));
 
   Shell::GetInstance()->window_cycle_controller()->HandleCycleWindow(
       WindowCycleController::BACKWARD);
 }
 
@@ skipping 752 matching lines @@
   if (restriction != RESTRICTION_NONE)
     return restriction == RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
 
   const ui::Accelerator& previous_accelerator =
       accelerator_history_->previous_accelerator();
 
   // True should be returned if running |action| does something. Otherwise,
   // false should be returned to give the web contents a chance at handling the
   // accelerator.
   switch (action) {
-    case ACCESSIBLE_FOCUS_NEXT:
-    case ACCESSIBLE_FOCUS_PREVIOUS:
-      return CanHandleAccessibleFocusCycle();
     case DEBUG_PRINT_LAYER_HIERARCHY:
     case DEBUG_PRINT_VIEW_HIERARCHY:
     case DEBUG_PRINT_WINDOW_HIERARCHY:
     case DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE:
     case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR:
     case DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
     case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
     case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
     case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
       return debug::DebugAcceleratorsEnabled();
@@ skipping 110 matching lines @@
                                           const ui::Accelerator& accelerator) {
   AcceleratorProcessingRestriction restriction =
       GetAcceleratorProcessingRestriction(action);
   if (restriction != RESTRICTION_NONE)
     return;
 
   // If your accelerator invokes more than one line of code, please either
   // implement it in your module's controller code (like TOGGLE_MIRROR_MODE
   // below) or pull it into a HandleFoo() function above.
   switch (action) {
-    case ACCESSIBLE_FOCUS_NEXT:
-      HandleAccessibleFocusCycle(false);
-      break;
-    case ACCESSIBLE_FOCUS_PREVIOUS:
-      HandleAccessibleFocusCycle(true);
-      break;
     case CYCLE_BACKWARD_MRU:
       HandleCycleBackwardMRU(accelerator);
       break;
     case CYCLE_FORWARD_MRU:
       HandleCycleForwardMRU(accelerator);
       break;
     case DEBUG_PRINT_LAYER_HIERARCHY:
     case DEBUG_PRINT_VIEW_HIERARCHY:
     case DEBUG_PRINT_WINDOW_HIERARCHY:
     case DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE:
@@ skipping 296 matching lines @@
 }
 
 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
     scoped_ptr<KeyboardBrightnessControlDelegate>
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 }  // namespace ash