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/shell_unittest.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/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index e48460d..93cabc8 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -462,7 +462,7 @@ TEST_F(ShellTest, FullscreenWindowHidesShelf) { TEST_F(ShellTest, ToggleAutoHide) { scoped_ptr<aura::Window> window(new aura::Window(NULL)); window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); - window->SetType(aura::client::WINDOW_TYPE_NORMAL); + window->SetType(ui::wm::WINDOW_TYPE_NORMAL); window->Init(ui::LAYER_TEXTURED); ParentWindowInPrimaryRootWindow(window.get()); window->Show(); |