diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 02:18:17 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 02:18:17 +0000 |
| commit | e8a097b80123a7e0f4b379d3cb76ff272e0cdfff (patch) | |
| tree | 3ee658c80b83851a045cdcd5afa2fd6d39df53fc /ash/launcher/tabbed_launcher_button.h | |
| parent | 6009ca9cf529d88a9fff4509dccb424a3ee0a57f (diff) | |
| download | chromium_src-e8a097b80123a7e0f4b379d3cb76ff272e0cdfff.zip chromium_src-e8a097b80123a7e0f4b379d3cb76ff272e0cdfff.tar.gz chromium_src-e8a097b80123a7e0f4b379d3cb76ff272e0cdfff.tar.bz2 | |
Removes support for multiple images from launcher. Doesn't look like
we're going to use it, so I'm nuking it. This also fixes the bug where
we would only even show one tab in the launcher even though the window
had more than one.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/9139077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/tabbed_launcher_button.h')
| -rw-r--r-- | ash/launcher/tabbed_launcher_button.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ash/launcher/tabbed_launcher_button.h b/ash/launcher/tabbed_launcher_button.h index 3a42951..c950a11 100644 --- a/ash/launcher/tabbed_launcher_button.h +++ b/ash/launcher/tabbed_launcher_button.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. @@ -6,7 +6,6 @@ #define ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_ #pragma once -#include "ash/launcher/launcher_types.h" #include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "ui/base/animation/animation_delegate.h" @@ -33,7 +32,7 @@ class TabbedLauncherButton : public views::ImageButton { void PrepareForImageChange(); // Sets the images to display for this entry. - void SetImages(const LauncherTabbedImages& images); + void SetTabImage(const SkBitmap& image, int count); protected: // View overrides: @@ -75,7 +74,7 @@ class TabbedLauncherButton : public views::ImageButton { // value. static ImageSet* CreateImageSet(int normal_id, int pushed_id, int hot_id); - LauncherTabbedImages images_; + SkBitmap image_; LauncherButtonHost* host_; |