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

Unified Diff: ash/launcher/tabbed_launcher_button.h

Issue 9649013: Show a different icon in the launcher for incognito windows (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Code review fix 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
Index: ash/launcher/tabbed_launcher_button.h
diff --git a/ash/launcher/tabbed_launcher_button.h b/ash/launcher/tabbed_launcher_button.h
index 44917b7f76290de403e07e34a4cbfdf54df54c6e..9958b0428fe93fb2740317bd101f56ab2e61b428 100644
--- a/ash/launcher/tabbed_launcher_button.h
+++ b/ash/launcher/tabbed_launcher_button.h
@@ -17,6 +17,9 @@ class MultiAnimation;
}
namespace ash {
+
+class LauncherItem;
+
namespace internal {
class LauncherButtonHost;
@@ -32,7 +35,7 @@ class TabbedLauncherButton : public views::ImageButton {
void PrepareForImageChange();
// Sets the images to display for this entry.
- void SetTabImage(const SkBitmap& image, int count);
+ void SetTabImage(const LauncherItem& item);
protected:
// View overrides:
@@ -90,11 +93,15 @@ class TabbedLauncherButton : public views::ImageButton {
bool show_image_;
// Background images. Which one is chosen depends upon how many images are
- // provided.
+ // provided and if the browser window is incognito.
static ImageSet* bg_image_1_;
static ImageSet* bg_image_2_;
static ImageSet* bg_image_3_;
+ static ImageSet* bg_private_image_1_;
+ static ImageSet* bg_private_image_2_;
+ static ImageSet* bg_private_image_3_;
+
views::GlowHoverController hover_controller_;
DISALLOW_COPY_AND_ASSIGN(TabbedLauncherButton);

Powered by Google App Engine
This is Rietveld 408576698