summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 04:14:57 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 04:14:57 +0000
commitb5828c7bcdb69c690c7158bc4e5b6de2bc212462 (patch)
treec58fafd7c1abb70bc8390dd59bde563f3de4032f /ash/shell
parentbba581bfe9545788b157b44f4835cda0cadbe0f6 (diff)
downloadchromium_src-b5828c7bcdb69c690c7158bc4e5b6de2bc212462.zip
chromium_src-b5828c7bcdb69c690c7158bc4e5b6de2bc212462.tar.gz
chromium_src-b5828c7bcdb69c690c7158bc4e5b6de2bc212462.tar.bz2
Reland 126256:
Show a different icon in the launcher for incognito windows TBR=sky@chromium.org BUG=116932 TEST=Open an incognito window and a normal window. Check that the icons are different Review URL: http://codereview.chromium.org/9691027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/shell_main.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index 339010b..b56cfe0 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -76,7 +76,8 @@ class WindowWatcher : public aura::WindowObserver {
virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE {
static int image_count = 0;
ash::LauncherModel* model = ash::Shell::GetInstance()->launcher()->model();
- ash::LauncherItem item(ash::TYPE_TABBED);
+ ash::LauncherItem item;
+ item.type = ash::TYPE_TABBED;
id_to_window_[model->next_id()] = new_window;
item.num_tabs = image_count + 1;
item.image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);