Index: ui/views_content_client/views_content_client_main_parts_chromeos.cc |
diff --git a/ui/views_content_client/views_content_client_main_parts_chromeos.cc b/ui/views_content_client/views_content_client_main_parts_chromeos.cc |
index 79e091144ff54c526dcfa016b09f09ae6048223b..36d24429a40594d3ecd5aea48b76a9b8c6fde99d 100644 |
--- a/ui/views_content_client/views_content_client_main_parts_chromeos.cc |
+++ b/ui/views_content_client/views_content_client_main_parts_chromeos.cc |
@@ -10,29 +10,12 @@ |
#include "ui/gfx/screen.h" |
#include "ui/views_content_client/views_content_client.h" |
#include "ui/views_content_client/views_content_client_main_parts_aura.h" |
-#include "ui/wm/core/nested_accelerator_controller.h" |
-#include "ui/wm/core/nested_accelerator_delegate.h" |
#include "ui/wm/test/wm_test_helper.h" |
namespace ui { |
namespace { |
-// A dummy version of the delegate usually provided by the Ash Shell. |
-class NestedAcceleratorDelegate : public ::wm::NestedAcceleratorDelegate { |
- public: |
- NestedAcceleratorDelegate() {} |
- ~NestedAcceleratorDelegate() override {} |
- |
- // ::wm::NestedAcceleratorDelegate: |
- Result ProcessAccelerator(const ui::Accelerator& accelerator) override { |
- return RESULT_NOT_PROCESSED; |
- } |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorDelegate); |
-}; |
- |
class ViewsContentClientMainPartsChromeOS |
: public ViewsContentClientMainPartsAura { |
public: |
@@ -49,7 +32,6 @@ class ViewsContentClientMainPartsChromeOS |
// Enable a minimal set of views::corewm to be initialized. |
scoped_ptr<gfx::Screen> test_screen_; |
scoped_ptr< ::wm::WMTestHelper> wm_test_helper_; |
- scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_; |
DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsChromeOS); |
}; |
@@ -75,16 +57,9 @@ void ViewsContentClientMainPartsChromeOS::PreMainMessageLoopRun() { |
// Ensure Aura knows where to open new windows. |
aura::Window* root_window = wm_test_helper_->host()->window(); |
views_content_client()->task().Run(browser_context(), root_window); |
- |
- nested_accelerator_controller_.reset( |
- new ::wm::NestedAcceleratorController(new NestedAcceleratorDelegate)); |
- aura::client::SetDispatcherClient(root_window, |
- nested_accelerator_controller_.get()); |
} |
void ViewsContentClientMainPartsChromeOS::PostMainMessageLoopRun() { |
- aura::client::SetDispatcherClient(wm_test_helper_->host()->window(), NULL); |
- nested_accelerator_controller_.reset(); |
wm_test_helper_.reset(); |
test_screen_.reset(); |