diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 05:13:59 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 05:13:59 +0000 |
| commit | 3f13cf1bb818c511a30b01730b27064b6908d40a (patch) | |
| tree | 4dcba0d4be32cc2ab132f2189a2c85a876d8f484 /ash/root_window_controller.cc | |
| parent | 5ebaa97366a34d6ac85685ee62c9cddf1df4b860 (diff) | |
| download | chromium_src-3f13cf1bb818c511a30b01730b27064b6908d40a.zip chromium_src-3f13cf1bb818c511a30b01730b27064b6908d40a.tar.gz chromium_src-3f13cf1bb818c511a30b01730b27064b6908d40a.tar.bz2 | |
* Remove unnecessary SetProperty(kStayInSameRootWindowKey)
This is set in container now, so no need to set individual window underneath.
* Set kStayInSameRootWindowKey to ShelfContainer, to be consistent with other containers.
* Rename launcher_container to shelf_container in RWC.cc.
BUG=256747
Review URL: https://chromiumcodereview.appspot.com/18688003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 06e35fc..3e46f50 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -605,11 +605,12 @@ void RootWindowController::CreateContainersInRootWindow( non_lock_screen_containers); SetUsesScreenCoordinates(panel_container); - aura::Window* launcher_container = + aura::Window* shelf_container = CreateContainer(kShellWindowId_ShelfContainer, - "LauncherContainer", + "ShelfContainer", non_lock_screen_containers); - SetUsesScreenCoordinates(launcher_container); + SetUsesScreenCoordinates(shelf_container); + DescendantShouldStayInSameRootWindow(shelf_container); aura::Window* app_list_container = CreateContainer(kShellWindowId_AppListContainer, |