diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-25 13:35:15 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-25 13:35:15 +0000 |
| commit | 165de394ecebc09dde064249137c775baf20dc4d (patch) | |
| tree | d2d7719041e1a2fce383208c51d15a282db8fca1 /ash/shell.cc | |
| parent | 7dca93ea629f94354224f82af1524f952a60bf14 (diff) | |
| download | chromium_src-165de394ecebc09dde064249137c775baf20dc4d.zip chromium_src-165de394ecebc09dde064249137c775baf20dc4d.tar.gz chromium_src-165de394ecebc09dde064249137c775baf20dc4d.tar.bz2 | |
Revert 272740 "Refactor and move ash independent accelerator han..."
Causing compile failures on Windows. Possible comatability issue
with https://codereview.chromium.org/298703007
Sample errors:
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\ui\wm\core\wm_unittests.nested_accelerator_controller_unittest.obj.rsp /c ..\..\ui\wm\core\nested_accelerator_controller_unittest.cc /Foobj\ui\wm\core\wm_unittests.nested_accelerator_controller_unittest.obj /Fdobj\ui\wm\wm_unittests.cc.pdb
c:\b\build\slave\win\build\src\ui\wm\core\nested_accelerator_controller_unittest.cc(83) : error C2039: 'host' : is not a member of 'aura::Window'
c:\b\build\slave\win\build\src\ui\aura\window.h(62) : see declaration of 'aura::Window'
c:\b\build\slave\win\build\src\ui\wm\core\nested_accelerator_controller_unittest.cc(83) : error C2227: left of '->PostNativeEvent' must point to class/struct/union/generic type
c:\b\build\slave\win\build\src\ui\wm\core\nested_accelerator_controller_unittest.cc(85) : error C2039: 'host' : is not a member of 'aura::Window'
c:\b\build\slave\win\build\src\ui\aura\window.h(62) : see declaration of 'aura::Window'
c:\b\build\slave\win\build\src\ui\wm\core\nested_accelerator_controller_unittest.cc(85) : error C2227: left of '->PostNativeEvent' must point to class/struct/union/generic type
ninja: build stopped: subcommand failed.
> Refactor and move ash independent accelerator handling code in nested loop to ui/wm/core
>
> I also renamed classes to NestedAcceleratorXxx. I felt this is a bit more clearer than NestedDispatcher, especially in ui/wm/core. Please let me know if you disagree or have better suggestion. I'm happy to rename them.
>
> BUG=None
>
> Review URL: https://codereview.chromium.org/298703007
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/300093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 1904f96..c0a1765 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -10,7 +10,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_filter.h" #include "ash/accelerators/focus_manager_factory.h" -#include "ash/accelerators/nested_accelerator_delegate.h" +#include "ash/accelerators/nested_dispatcher_controller.h" #include "ash/accelerometer/accelerometer_controller.h" #include "ash/ash_switches.h" #include "ash/autoclick/autoclick_controller.h" @@ -108,7 +108,6 @@ #include "ui/wm/core/compound_event_filter.h" #include "ui/wm/core/focus_controller.h" #include "ui/wm/core/input_method_event_filter.h" -#include "ui/wm/core/nested_accelerator_controller.h" #include "ui/wm/core/shadow_controller.h" #include "ui/wm/core/user_activity_detector.h" #include "ui/wm/core/visibility_controller.h" @@ -754,7 +753,7 @@ Shell::~Shell() { partial_magnification_controller_.reset(); tooltip_controller_.reset(); event_client_.reset(); - nested_accelerator_controller_.reset(); + nested_dispatcher_controller_.reset(); toplevel_window_event_handler_.reset(); visibility_controller_.reset(); // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be @@ -880,8 +879,7 @@ void Shell::Init(const ShellInitParams& init_params) { cursor_manager_.SetDisplay(GetScreen()->GetPrimaryDisplay()); - nested_accelerator_controller_.reset( - new ::wm::NestedAcceleratorController(new NestedAcceleratorDelegate)); + nested_dispatcher_controller_.reset(new NestedDispatcherController); accelerator_controller_.reset(new AcceleratorController); maximize_mode_controller_.reset(new MaximizeModeController()); @@ -1094,9 +1092,9 @@ void Shell::InitRootWindow(aura::Window* root_window) { root_window->AddPreTargetHandler(toplevel_window_event_handler_.get()); root_window->AddPostTargetHandler(toplevel_window_event_handler_.get()); - if (nested_accelerator_controller_) { + if (nested_dispatcher_controller_) { aura::client::SetDispatcherClient(root_window, - nested_accelerator_controller_.get()); + nested_dispatcher_controller_.get()); } } |