Aura: Create a new containerr for drag/drop images and tooltips.

BUG=111148
TEST=manual

Review URL: https://chromiumcodereview.appspot.com/9314040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120230 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 21 insertions, 7 deletions

diff --git a/ash/shell.cc b/ash/shell.cc
index b3abd05..1b06566 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -133,10 +133,16 @@ void CreateSpecialContainers(aura::Window::Windows* containers) {
   containers->push_back(status_container);
 
   aura::Window* menu_container = new aura::Window(NULL);
-  menu_container->set_id(internal::kShellWindowId_MenuAndTooltipContainer);
+  menu_container->set_id(internal::kShellWindowId_MenuContainer);
   SetChildWindowVisibilityChangesAnimated(menu_container);
   containers->push_back(menu_container);
 
+  aura::Window* drag_drop_container = new aura::Window(NULL);
+  drag_drop_container->set_id(
+      internal::kShellWindowId_DragImageAndTooltipContainer);
+  SetChildWindowVisibilityChangesAnimated(drag_drop_container);
+  containers->push_back(drag_drop_container);
+
   aura::Window* setting_bubble_container = new aura::Window(NULL);
   setting_bubble_container->set_id(
       internal::kShellWindowId_SettingBubbleContainer);
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index c745a37..883a3a4 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -59,7 +59,9 @@ void ExpectAllContainers() {
   EXPECT_TRUE(
       shell->GetContainer(internal::kShellWindowId_StatusContainer));
   EXPECT_TRUE(
-      shell->GetContainer(internal::kShellWindowId_MenuAndTooltipContainer));
+      shell->GetContainer(internal::kShellWindowId_MenuContainer));
+  EXPECT_TRUE(shell->GetContainer(
+      internal::kShellWindowId_DragImageAndTooltipContainer));
   EXPECT_TRUE(
       shell->GetContainer(internal::kShellWindowId_SettingBubbleContainer));
 }
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index fcca022..981698f 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -43,12 +43,15 @@ const int kShellWindowId_LockSystemModalContainer = 8;
 // The container for the status area.
 const int kShellWindowId_StatusContainer = 9;
 
-// The container for menus and tooltips.
-const int kShellWindowId_MenuAndTooltipContainer = 10;
+// The container for menus.
+const int kShellWindowId_MenuContainer = 10;
+
+// The container for drag/drop images and tooltips.
+const int kShellWindowId_DragImageAndTooltipContainer = 11;
 
 // The container for bubbles briefly overlaid onscreen to show settings changes
 // (volume, brightness, etc.).
-const int kShellWindowId_SettingBubbleContainer = 11;
+const int kShellWindowId_SettingBubbleContainer = 12;
 
 }  // namespace internal
 
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index c05c90e..70b45b8 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -73,7 +73,8 @@ const int kScreenLockerContainerIds[] = {
 // is locked.
 const int kRelatedContainerIds[] = {
   internal::kShellWindowId_StatusContainer,
-  internal::kShellWindowId_MenuAndTooltipContainer,
+  internal::kShellWindowId_MenuContainer,
+  internal::kShellWindowId_DragImageAndTooltipContainer,
   internal::kShellWindowId_SettingBubbleContainer,
 };
 
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index e3d34c2..31c48e9 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -54,8 +54,10 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* window) {
     case aura::client::WINDOW_TYPE_PANEL:
       return GetContainer(internal::kShellWindowId_PanelContainer);
     case aura::client::WINDOW_TYPE_MENU:
+      return GetContainer(internal::kShellWindowId_MenuContainer);
     case aura::client::WINDOW_TYPE_TOOLTIP:
-      return GetContainer(internal::kShellWindowId_MenuAndTooltipContainer);
+      return GetContainer(
+          internal::kShellWindowId_DragImageAndTooltipContainer);
     case aura::client::WINDOW_TYPE_CONTROL:
       return GetContainer(internal::kShellWindowId_UnparentedControlContainer);
     default: