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/compositor/layer.h"
 #include "ui/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_delegate.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 {

[Ben Goodger (Google), 2012/05/07 15:42:51]

Can we move this closer to the accelerators stuff rather than hosting it here?
This file is getting a bit cramped.

[Yusuke Sato, 2012/05/08 02:15:57]

Done.

+ public:
+  AshFocusManagerFactory() {}
+  virtual ~AshFocusManagerFactory() {}
+
+ protected:
+  virtual views::FocusManager* CreateFocusManager(Widget* widget) OVERRIDE {
+    return new views::FocusManager(widget, new Delegate);
+  }
+
+ private:
+  class Delegate : public views::FocusManagerDelegate {
+   public:
+    // views::FocusManagerDelegate overrides:
+    virtual bool ProcessAccelerator(
+        const ui::Accelerator& accelerator) OVERRIDE {
+#if !defined(OS_MACOSX)

[Ben Goodger (Google), 2012/05/07 15:42:51]

dhollowa has become distracted from implementing MacOS/ash stuff for the time
being. I imagine he'll be distracted for at least six months. We should not
bother supporting OS_MACOSX like this at this level right now.

[Yusuke Sato, 2012/05/08 02:15:57]

Done.

+      AcceleratorController* controller =
+          Shell::GetInstance()->accelerator_controller();
+      if (controller)
+        return controller->Process(accelerator);
+#endif
+      return false;
+    }
+
+    virtual ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
+        const ui::Accelerator& accelerator) const OVERRIDE {
+#if !defined(OS_MACOSX)
+      AcceleratorController* controller =
+          Shell::GetInstance()->accelerator_controller();
+      if (controller && controller->IsRegistered(accelerator))
+        return controller;
+#endif
+      return NULL;
+    }
+  };
+
+  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