summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 05:31:00 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 05:31:00 +0000
commitedf915bd3ab8d12dfe80bafd12895383b0613f2d (patch)
tree0e0e73ff66217138643adf8c62053bb40fcd5c4c /ash/shell
parent0b52af375b397ff6c950064bf04dbb7bdfeb43f9 (diff)
downloadchromium_src-edf915bd3ab8d12dfe80bafd12895383b0613f2d.zip
chromium_src-edf915bd3ab8d12dfe80bafd12895383b0613f2d.tar.gz
chromium_src-edf915bd3ab8d12dfe80bafd12895383b0613f2d.tar.bz2
Align panel icons on the right / end.
BUG=160605 TEST=LauncherModel.AddIndices, LauncherViewTest.AddPanelHidesTabbedBrowser, LauncherViewTest.PanelsHideLast Review URL: https://chromiumcodereview.appspot.com/11348201 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/window_watcher.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index 157a598..60324fb9 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -79,7 +79,8 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
static int image_count = 0;
ash::LauncherModel* model = Launcher::ForPrimaryDisplay()->model();
ash::LauncherItem item;
- item.type = ash::TYPE_TABBED;
+ item.type = new_window->type() == aura::client::WINDOW_TYPE_PANEL ?
+ ash::TYPE_APP_PANEL : ash::TYPE_TABBED;
id_to_window_[model->next_id()] = new_window;
SkBitmap icon_bitmap;