diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 08:13:45 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 08:13:45 +0000 |
| commit | f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9 (patch) | |
| tree | 57061cf0622e2b9edee2428ac332de8967bccdea /ash/wm | |
| parent | 728f28f2dfd7e22a414a8657229af008a19d7a9d (diff) | |
| download | chromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.zip chromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.tar.gz chromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.tar.bz2 | |
Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.
Other notable changes:
* Removed WindowTreeHostFactory as this is no longer necessary.
* Moved RootWindowTransformer to ash/host
* Removed Set/GetInsets which are no longer necessary (a code in SetInsets is now a part of
SetRootWindowTransformer)
* Added TransformerHelper that implements common behavior to transform root window for AshWindowTreeHost
* Added DEPS files
* Updated metro_viewer code to make sure it creates ash::AshRemoteWindowHostTree
A few more simplifications to come:
* Simplify RootWindowTransformer
* Eliminate EnvObserver in AshWindowTreeHostX11
I'll also work on DEPS reorg to make it more explicit under ash/
BUG=355771
TEST=No functional change. ui/aura/window_tree_host_x11_unittests has been moved to ash/host/ash_window_tree_host_x11_unittests
Review URL: https://codereview.chromium.org/201573015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/maximize_mode/maximize_mode_window_manager.cc | 2 | ||||
| -rw-r--r-- | ash/wm/window_manager_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/wm/maximize_mode/maximize_mode_window_manager.cc index eb133f7..9de08eb 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.cc @@ -211,7 +211,7 @@ void MaximizeModeWindowManager::EnableBackdropBehindTopWindowOnEachDisplay( iter != controllers.end(); ++iter) { RootWindowController* controller = *iter; aura::Window* container = Shell::GetContainer( - controller->root_window(), kShellWindowId_DefaultContainer); + controller->GetRootWindow(), kShellWindowId_DefaultContainer); controller->workspace_controller()->SetMaximizeBackdropDelegate( scoped_ptr<WorkspaceLayoutManagerDelegate>( enable ? new WorkspaceBackdropDelegate(container) : NULL)); diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index a94395f..cc1a675 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -604,7 +604,7 @@ TEST_F(WindowManagerTest, MAYBE_TransformActivate) { gfx::Transform transform; transform.Translate(size.width(), 0); transform.Rotate(90.0f); - root_window->GetHost()->SetTransform(transform); + root_window->GetHost()->SetRootTransform(transform); test::TestActivationDelegate d1; aura::test::TestWindowDelegate wd; |