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

Unified Diff: chrome/browser/ui/views/ash/launcher/launcher_updater.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/launcher_updater.cc
===================================================================
--- chrome/browser/ui/views/ash/launcher/launcher_updater.cc (revision 126259)
+++ chrome/browser/ui/views/ash/launcher/launcher_updater.cc (working copy)
@@ -38,8 +38,6 @@
launcher_delegate_(delegate),
type_(type),
app_id_(app_id),
- is_incognito_(tab_model->profile()->GetOriginalProfile() !=
- tab_model->profile()),
item_id_(-1) {
}
@@ -274,9 +272,7 @@
launcher_delegate_->LauncherItemClosed(launcher_id);
CreateTabbedItem();
}
- ash::LauncherItem item;
- item.type = ash::TYPE_TABBED;
- item.is_incognito = is_incognito_;
+ ash::LauncherItem item(ash::TYPE_TABBED);
item.num_tabs = tab_model_->count();
launcher_model()->Set(launcher_model()->ItemIndexByID(item_id_), item);
} else {
@@ -329,10 +325,7 @@
void LauncherUpdater::CreateTabbedItem() {
DCHECK_EQ(-1, item_id_);
- item_id_ = launcher_delegate_->CreateTabbedLauncherItem(
- this,
- is_incognito_ ? ChromeLauncherDelegate::STATE_INCOGNITO :
- ChromeLauncherDelegate::STATE_NOT_INCOGNITO);
+ item_id_ = launcher_delegate_->CreateTabbedLauncherItem(this);
}
bool LauncherUpdater::ContainsID(ash::LauncherID id, TabContentsWrapper** tab) {
« no previous file with comments | « chrome/browser/ui/views/ash/launcher/launcher_updater.h ('k') | ui/resources/aura/launcher_incognito_browser.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698