diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 01:50:05 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 01:50:05 +0000 |
| commit | 5b251f10c00377eb437bf11d52128ff7f359a5e3 (patch) | |
| tree | 56695914261a7a2d9ad8e8934080551c8db90452 /ash/accelerators/accelerator_controller.cc | |
| parent | 8eb21c922f41dd850ea71e7fb391e50f7b4a9f5f (diff) | |
| download | chromium_src-5b251f10c00377eb437bf11d52128ff7f359a5e3.zip chromium_src-5b251f10c00377eb437bf11d52128ff7f359a5e3.tar.gz chromium_src-5b251f10c00377eb437bf11d52128ff7f359a5e3.tar.bz2 | |
wm: public window_types.
Patch manually generated by:
$ git grep -l aura::client::WINDOW_TYPE | xargs sed -i -e 's/aura::client::WINDOW_TYPE/ui::wm::WINDOW_TYPE/g'
$ git commit -a -m.
$ git clang-format HEAD^ --style=Chromium
$ git commit -a -m.
* Move window_types.h header from ui/aura/client/ to ui/wm/public/
BUG=319638
TEST=ash_unittests, aura_unittests, views_unittests, unit_tests
R=ben@chromium.org
Review URL: https://codereview.chromium.org/115153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 0ac3f7e..30271ef 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -580,7 +580,7 @@ bool HandleWindowSnap(int action) { // Disable window snapping shortcut key for full screen window due to // http://crbug.com/135487. if (!window_state || - window_state->window()->type() != aura::client::WINDOW_TYPE_NORMAL || + window_state->window()->type() != ui::wm::WINDOW_TYPE_NORMAL || window_state->IsFullscreen()) { return false; } |