aura: Add container for setting bubbles.

This adds a new container (with nothing stored in it yet)
for the bubbles that are briefly displayed on Chrome OS when
the volume or brightness is changed.

I'm also renaming the MenusAndTooltipsContainer window ID
constant to MenuAndTooltipContainer to match the other
constants.

BUG=108389
TEST=compiles

Review URL: http://codereview.chromium.org/9110034

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

5 files changed, 18 insertions, 8 deletions

diff --git a/ash/shell.cc b/ash/shell.cc
index 5eb0072..f7feef0 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -120,8 +120,13 @@ 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_MenusAndTooltipsContainer);
+  menu_container->set_id(internal::kShellWindowId_MenuAndTooltipContainer);
   containers->push_back(menu_container);
+
+  aura::Window* setting_bubble_container = new aura::Window(NULL);
+  setting_bubble_container->set_id(
+      internal::kShellWindowId_SettingBubbleContainer);
+  containers->push_back(setting_bubble_container);
 }
 
 }  // namespace
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index 53a7b38..42849c4 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -40,7 +40,11 @@ const int kShellWindowId_LockModalContainer = 7;
 const int kShellWindowId_StatusContainer = 8;
 
 // The container for menus and tooltips.
-const int kShellWindowId_MenusAndTooltipsContainer = 9;
+const int kShellWindowId_MenuAndTooltipContainer = 9;
+
+// The container for bubbles briefly overlaid onscreen to show settings changes
+// (volume, brightness, etc.).
+const int kShellWindowId_SettingBubbleContainer = 10;
 
 }  // namespace internal
 
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index b0e34c8..2c720db 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -71,7 +71,8 @@ const int kScreenLockerContainerIds[] = {
 // is locked.
 const int kRelatedContainerIds[] = {
   internal::kShellWindowId_StatusContainer,
-  internal::kShellWindowId_MenusAndTooltipsContainer,
+  internal::kShellWindowId_MenuAndTooltipContainer,
+  internal::kShellWindowId_SettingBubbleContainer,
 };
 
 // Is |window| a container that holds screen locker windows?
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index be368629..08a990b 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -55,7 +55,7 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* window) {
       return GetContainer(internal::kShellWindowId_PanelContainer);
     case aura::client::WINDOW_TYPE_MENU:
     case aura::client::WINDOW_TYPE_TOOLTIP:
-      return GetContainer(internal::kShellWindowId_MenusAndTooltipsContainer);
+      return GetContainer(internal::kShellWindowId_MenuAndTooltipContainer);
     default:
       NOTREACHED() << "Window " << window->id()
                    << " has unhandled type " << window->type();
diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
index 62ea434..b1ae7d1 100644
--- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
+++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -188,7 +188,7 @@ KeyboardWidget::KeyboardWidget()
   Init(params);
 #if defined(USE_AURA)
   ash::Shell::GetInstance()->GetContainer(
-      ash::internal::kShellWindowId_MenusAndTooltipsContainer)->
+      ash::internal::kShellWindowId_MenuAndTooltipContainer)->
       AddChild(GetNativeView());
 #endif