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

Unified Diff: chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc

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
Index: chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc
===================================================================
--- chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc (revision 126259)
+++ chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc (working copy)
@@ -122,8 +122,7 @@
}
ash::LauncherID ChromeLauncherDelegate::CreateTabbedLauncherItem(
- LauncherUpdater* updater,
- IncognitoState is_incognito) {
+ LauncherUpdater* updater) {
// Tabbed items always get a new item. Put the tabbed item before the app
// tabs. If there are no app tabs put it at the end.
int index = static_cast<int>(model_->items().size());
@@ -135,9 +134,7 @@
}
}
ash::LauncherID id = model_->next_id();
- ash::LauncherItem item;
- item.type = ash::TYPE_TABBED;
- item.is_incognito = (is_incognito == STATE_INCOGNITO);
+ ash::LauncherItem item(ash::TYPE_TABBED);
item.status = ash::STATUS_RUNNING;
model_->Add(index, item);
DCHECK(id_to_item_map_.find(id) == id_to_item_map_.end());
@@ -186,9 +183,7 @@
int insert_index = min_app_index != item_count ?
min_app_index : std::min(item_count, min_tab_index + 1);
ash::LauncherID id = model_->next_id();
- ash::LauncherItem item;
- item.type = ash::TYPE_APP;
- item.is_incognito = false;
+ ash::LauncherItem item(ash::TYPE_APP);
item.image = Extension::GetDefaultIcon(true);
item.status = status;
model_->Add(insert_index, item);
@@ -230,9 +225,7 @@
id_to_item_map_[id].app_type = app_type;
id_to_item_map_[id].app_id = app_id;
- ash::LauncherItem item;
- item.type = ash::TYPE_APP;
- item.is_incognito = false;
+ ash::LauncherItem item(ash::TYPE_APP);
item.id = id;
model_->Set(model_->ItemIndexByID(id), item);

Powered by Google App Engine
This is Rietveld 408576698