Removes InputMethodContainer, merge into SettingsBubbleContainer

We don't have to have a container for IME separately, the settings
bubble container is better for the IME UIs.

This switch also makes the following effects:
- IME UIs would appear in the lock screen / login screen
- IME UIs wouldn't move across the root window when removed (like
  display state switch among mirroring<->extended)

The first is good, because we can show the mode indicator when
switching the layout between qwerty and Dvorak. Candidate windows
will not appear in lock/login screen anyways.

The second seems no problem because IME UIs are more ephemeral
anyways. People won't get frustrated if disappears in such situation.
They will re-appear when the user types another key.

BUG=364667
R=oshima@chromium.org, shuchen@chromium.org

Review URL: https://codereview.chromium.org/245783003

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

2 files changed, 13 insertions, 26 deletions

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 6dd3b67..ba38e14 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -157,7 +157,6 @@ void ReparentAllWindows(aura::Window* src, aura::Window* dst) {
       kShellWindowId_AlwaysOnTopContainer,
       kShellWindowId_SystemModalContainer,
       kShellWindowId_LockSystemModalContainer,
-      kShellWindowId_InputMethodContainer,
       kShellWindowId_UnparentedControlContainer, };
   for (size_t i = 0; i < arraysize(kContainerIdsToMove); i++) {
     int id = kContainerIdsToMove[i];
@@ -936,13 +935,6 @@ void RootWindowController::CreateContainersInRootWindow(
   SetUsesScreenCoordinates(modal_container);
   SetUsesEasyResizeTargeter(modal_container);
 
-  aura::Window* input_method_container = CreateContainer(
-      kShellWindowId_InputMethodContainer,
-      "InputMethodContainer",
-      non_lock_screen_containers);
-  ::wm::SetChildWindowVisibilityChangesAnimated(input_method_container);
-  SetUsesScreenCoordinates(input_method_container);
-
   // TODO(beng): Figure out if we can make this use
   // SystemModalContainerEventFilter instead of stops_event_propagation.
   aura::Window* lock_container = CreateContainer(
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index a4bd516..f01e74b 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -61,50 +61,45 @@ const int kShellWindowId_AppListContainer = 12;
 // The container for user-specific modal windows.
 const int kShellWindowId_SystemModalContainer = 13;
 
-// The container for input method components such like candidate windows.  They
-// are almost panels but have no activations/focus, and they should appear over
-// the AppList and SystemModal dialogs.
-const int kShellWindowId_InputMethodContainer = 14;
-
 // The container for the lock screen background.
-const int kShellWindowId_LockScreenBackgroundContainer = 15;
+const int kShellWindowId_LockScreenBackgroundContainer = 14;
 
 // The container for the lock screen.
-const int kShellWindowId_LockScreenContainer = 16;
+const int kShellWindowId_LockScreenContainer = 15;
 
 // The container for the lock screen modal windows.
-const int kShellWindowId_LockSystemModalContainer = 17;
+const int kShellWindowId_LockSystemModalContainer = 16;
 
 // The container for the status area.
-const int kShellWindowId_StatusContainer = 18;
+const int kShellWindowId_StatusContainer = 17;
 
 // The container for menus.
-const int kShellWindowId_MenuContainer = 19;
+const int kShellWindowId_MenuContainer = 18;
 
 // The container for drag/drop images and tooltips.
-const int kShellWindowId_DragImageAndTooltipContainer = 20;
+const int kShellWindowId_DragImageAndTooltipContainer = 19;
 
 // The container for bubbles briefly overlaid onscreen to show settings changes
-// (volume, brightness, etc.).
-const int kShellWindowId_SettingBubbleContainer = 21;
+// (volume, brightness, input method bubbles, etc.).
+const int kShellWindowId_SettingBubbleContainer = 20;
 
 // The container for special components overlaid onscreen, such as the
 // region selector for partial screenshots.
-const int kShellWindowId_OverlayContainer = 22;
+const int kShellWindowId_OverlayContainer = 21;
 
 // ID of the window created by PhantomWindowController or DragWindowController.
-const int kShellWindowId_PhantomWindow = 23;
+const int kShellWindowId_PhantomWindow = 22;
 
 // A parent container that holds the virtual keyboard container. This is to
 // ensure that the virtual keyboard is stacked above most containers but below
 // the mouse cursor and the power off animation.
-const int kShellWindowId_VirtualKeyboardParentContainer = 24;
+const int kShellWindowId_VirtualKeyboardParentContainer = 23;
 
 // The container for mouse cursor.
-const int kShellWindowId_MouseCursorContainer = 25;
+const int kShellWindowId_MouseCursorContainer = 24;
 
 // The topmost container, used for power off animation.
-const int kShellWindowId_PowerButtonAnimationContainer = 26;
+const int kShellWindowId_PowerButtonAnimationContainer = 25;
 
 }  // namespace ash