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/root_window_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/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index e439ac3..58088c7 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -51,7 +51,6 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/tooltip_client.h" -#include "ui/aura/client/window_types.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" @@ -68,6 +67,7 @@ #include "ui/views/corewm/visibility_controller.h" #include "ui/views/view_model.h" #include "ui/views/view_model_utils.h" +#include "ui/wm/public/window_types.h" #if defined(OS_CHROMEOS) #include "ash/wm/boot_splash_screen_chromeos.h" @@ -288,7 +288,7 @@ RootWindowController* RootWindowController::ForTargetRootWindow() { aura::Window* RootWindowController::GetContainerForWindow( aura::Window* window) { aura::Window* container = window->parent(); - while (container && container->type() != aura::client::WINDOW_TYPE_UNKNOWN) + while (container && container->type() != ui::wm::WINDOW_TYPE_UNKNOWN) container = container->parent(); return container; } @@ -566,8 +566,8 @@ const aura::Window* RootWindowController::GetWindowForFullscreenMode() const { const aura::Window* topmost_window = NULL; for (aura::Window::Windows::const_reverse_iterator iter = windows.rbegin(); iter != windows.rend(); ++iter) { - if (((*iter)->type() == aura::client::WINDOW_TYPE_NORMAL || - (*iter)->type() == aura::client::WINDOW_TYPE_PANEL) && + if (((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL || + (*iter)->type() == ui::wm::WINDOW_TYPE_PANEL) && (*iter)->layer()->GetTargetVisibility()) { topmost_window = *iter; break; |