summaryrefslogtreecommitdiffstats
path: root/ash/shell_window_ids.h
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 16:04:40 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 16:04:40 +0000
commitf471accc5594bbdfd352d3d1b39cfdfdaa8fbb39 (patch)
tree61ed1f5e4aca068cb78e158e1a8dd20ad2a516bf /ash/shell_window_ids.h
parent55a169d06a806df51d2f6af360908cb6910a64e9 (diff)
downloadchromium_src-f471accc5594bbdfd352d3d1b39cfdfdaa8fbb39.zip
chromium_src-f471accc5594bbdfd352d3d1b39cfdfdaa8fbb39.tar.gz
chromium_src-f471accc5594bbdfd352d3d1b39cfdfdaa8fbb39.tar.bz2
Change the parent container for the IME candidate window.
This CL creates a new container (InputMethodContainer) and use it. BUG=130713 TEST=manually checked with app-list and network dialog. Made sure doesn't break alt-tab. No additional breaks on aura_shell_unittest Review URL: https://chromiumcodereview.appspot.com/10629013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_window_ids.h')
-rw-r--r--ash/shell_window_ids.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index 192c577..f0bf6f1c 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -53,28 +53,33 @@ const int kShellWindowId_AppListContainer = 9;
// The container for user-specific modal windows.
const int kShellWindowId_SystemModalContainer = 10;
+// 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 = 11;
+
// The container for the lock screen.
-const int kShellWindowId_LockScreenContainer = 11;
+const int kShellWindowId_LockScreenContainer = 12;
// The container for the lock screen modal windows.
-const int kShellWindowId_LockSystemModalContainer = 12;
+const int kShellWindowId_LockSystemModalContainer = 13;
// The container for the status area.
-const int kShellWindowId_StatusContainer = 13;
+const int kShellWindowId_StatusContainer = 14;
// The container for menus.
-const int kShellWindowId_MenuContainer = 14;
+const int kShellWindowId_MenuContainer = 15;
// The container for drag/drop images and tooltips.
-const int kShellWindowId_DragImageAndTooltipContainer = 15;
+const int kShellWindowId_DragImageAndTooltipContainer = 16;
// The container for bubbles briefly overlaid onscreen to show settings changes
// (volume, brightness, etc.).
-const int kShellWindowId_SettingBubbleContainer = 16;
+const int kShellWindowId_SettingBubbleContainer = 17;
// The container for special components overlaid onscreen, such as the
// region selector for partial screenshots.
-const int kShellWindowId_OverlayContainer = 17;
+const int kShellWindowId_OverlayContainer = 18;
} // namespace internal