Let Chrome app handle Ash accelerators first if the app is launched as a window

ash/shell.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/shell.h"
 
 #include <algorithm>
 
+#include "ash/accelerators/accelerator_table.h"
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
 #include "ash/magnifier/magnification_controller.h"
@@ skipping 44 matching lines @@
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
+#include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/ui_controls/ui_controls.h"
+#include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
 namespace ash {
@@ skipping 402 matching lines @@
   bool wifi_enabled_;
   bool cellular_enabled_;
   bool bluetooth_enabled_;
   float volume_;
   bool caps_lock_enabled_;
   SkBitmap null_image_;
 
   DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
 };
 
+class AshFocusManagerFactory : public views::FocusManagerFactory {
+ public:
+  AshFocusManagerFactory() {}
+  virtual ~AshFocusManagerFactory() {}
+
+ protected:
+  virtual views::FocusManager* CreateFocusManager(Widget* widget) OVERRIDE {
+    views::FocusManager* manager = new views::FocusManager(widget);
+#if !defined(OS_MACOSX)

[Ben Goodger (Google), 2012/05/04 16:25:33]

why the OS_MACOSX?

[Yusuke Sato, 2012/05/07 08:27:28]

Because accelerator_controller() is currently not available on Mac OS X.
According to dhollowa@, Mac Aura does not work with the accelerator controller
yet.

+    AcceleratorController* target =
+        Shell::GetInstance()->accelerator_controller();
+    DCHECK(target);
+    for (size_t i = 0; i < kAcceleratorDataLength; ++i) {
+      ui::Accelerator accelerator(kAcceleratorData[i].keycode,
+                                  kAcceleratorData[i].shift,
+                                  kAcceleratorData[i].ctrl,
+                                  kAcceleratorData[i].alt);
+      accelerator.set_type(kAcceleratorData[i].trigger_on_press ?
+                           ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED);
+      manager->RegisterAccelerator(accelerator,
+                                   ui::AcceleratorManager::kNormalPriority,
+                                   target);

[Ben Goodger (Google), 2012/05/04 16:25:33]

This injection makes me a little scared. Is there a way to have the focus
manager delegate to a higher power if there is no handler?

i.e. in PreHandleKeyboardEvent, you would just pass to the focus manager to
handle... and if the focus manager can't handle then there is some aura client
interface that code in ash implements to receive unhandled accelerators.

[Yusuke Sato, 2012/05/07 08:27:28]

Done.

On 2012/05/04 16:25:33, Ben Goodger (Google) wrote:
Added ui/views/focus/focus_manager_delegate.h and simplified
AshFocusManagerFactory.
Removed the |target| checking code from PreHandleKeyboardEvent. Not the function
simply passes an accelerator to the focus manager.

+    }
+#endif
+    return manager;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory);
+};
+
 }  // namespace
 
 // static
 Shell* Shell::instance_ = NULL;
 // static
 bool Shell::initially_hide_cursor_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell::TestApi
 
@@ skipping 25 matching lines @@
       root_filter_(NULL),
       delegate_(delegate),
       shelf_(NULL),
       panel_layout_manager_(NULL),
       root_window_layout_(NULL) {
   gfx::Screen::SetInstance(screen_);
   ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
 }
 
 Shell::~Shell() {
+  views::FocusManagerFactory::Install(NULL);
+
   RemoveRootWindowEventFilter(key_rewriter_filter_.get());
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
   RemoveRootWindowEventFilter(system_gesture_filter_.get());
 #if !defined(OS_MACOSX)
   RemoveRootWindowEventFilter(accelerator_filter_.get());
 #endif
 
   // Close background widget now so that the focus manager of the
@@ skipping 178 matching lines @@
   AddRootWindowEventFilter(tooltip_controller_.get());
 
   drag_drop_controller_.reset(new internal::DragDropController);
   magnification_controller_.reset(new internal::MagnificationController);
   power_button_controller_.reset(new PowerButtonController);
   AddShellObserver(power_button_controller_.get());
   video_detector_.reset(new VideoDetector);
   window_cycle_controller_.reset(new WindowCycleController);
   monitor_controller_.reset(new internal::MonitorController);
   screen_dimmer_.reset(new internal::ScreenDimmer);
+
+  views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 }
 
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return GetRootWindow()->GetChildById(container_id);
 }
@@ skipping 174 matching lines @@
     panel_container->SetLayoutManager(panel_layout_manager_);
   }
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash