Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3266)

Unified Diff: ash/launcher/tabbed_launcher_button.h

Issue 9692021: Revert 126256 - Show a different icon in the launcher for incognito windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/launcher/tabbed_launcher_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/tabbed_launcher_button.h
===================================================================
--- ash/launcher/tabbed_launcher_button.h (revision 126259)
+++ ash/launcher/tabbed_launcher_button.h (working copy)
@@ -18,23 +18,13 @@
}
namespace ash {
-
-class LauncherItem;
-
namespace internal {
// Button used for items on the launcher corresponding to tabbed windows.
class TabbedLauncherButton : public LauncherButton {
public:
- // Indicates if this button is incognito or not.
- enum IncognitoState {
- STATE_INCOGNITO,
- STATE_NOT_INCOGNITO,
- };
-
static TabbedLauncherButton* Create(views::ButtonListener* listener,
- LauncherButtonHost* host,
- IncognitoState is_incognito);
+ LauncherButtonHost* host);
virtual ~TabbedLauncherButton();
// Notification that the images are about to change. Kicks off an animation.
@@ -45,8 +35,7 @@
protected:
TabbedLauncherButton(views::ButtonListener* listener,
- LauncherButtonHost* host,
- IncognitoState is_incognito);
+ LauncherButtonHost* host);
// View override.
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
@@ -58,7 +47,7 @@
class IconView : public LauncherButton::IconView,
public ui::AnimationDelegate {
public:
- IconView(TabbedLauncherButton* host, IncognitoState is_incognito);
+ explicit IconView(TabbedLauncherButton* host);
virtual ~IconView();
// ui::AnimationDelegateImpl overrides:
@@ -89,10 +78,8 @@
// Background images. Which one is chosen depends on the type of the window.
static SkBitmap* browser_image_;
- static SkBitmap* incognito_browser_image_;
// TODO[dave] implement panel specific image.
static SkBitmap* browser_panel_image_;
- static SkBitmap* incognito_browser_panel_image_;
DISALLOW_COPY_AND_ASSIGN(IconView);
};
@@ -101,10 +88,6 @@
return static_cast<IconView*>(icon_view());
}
- // Indicates if the tabbed browser associated with this is an incognito
- // window.
- const IncognitoState is_incognito_;
-
DISALLOW_COPY_AND_ASSIGN(TabbedLauncherButton);
};
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/launcher/tabbed_launcher_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698