Index: chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc |
diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc b/chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc |
index 703c5a8793fbad62f83fb49ad4e152a268ecde0d..dffd309a16df46582dbf8d11fd938b6464078239 100644 |
--- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc |
+++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc |
@@ -122,7 +122,7 @@ void ChromeLauncherDelegate::RegisterUserPrefs(PrefService* user_prefs) { |
} |
ash::LauncherID ChromeLauncherDelegate::CreateTabbedLauncherItem( |
- LauncherUpdater* updater) { |
+ LauncherUpdater* updater, bool is_private) { |
sky
2012/03/09 18:18:08
Wrap is_private
Zachary Kuznia
2012/03/09 22:17:35
Done.
|
// 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()); |
@@ -134,7 +134,7 @@ ash::LauncherID ChromeLauncherDelegate::CreateTabbedLauncherItem( |
} |
} |
ash::LauncherID id = model_->next_id(); |
- ash::LauncherItem item(ash::TYPE_TABBED); |
+ ash::LauncherItem item(ash::TYPE_TABBED, is_private); |
model_->Add(index, item); |
DCHECK(id_to_item_map_.find(id) == id_to_item_map_.end()); |
id_to_item_map_[id].item_type = TYPE_TABBED_BROWSER; |
@@ -180,7 +180,7 @@ ash::LauncherID ChromeLauncherDelegate::CreateAppLauncherItem( |
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(ash::TYPE_APP); |
+ ash::LauncherItem item(ash::TYPE_APP, false); |
item.image = Extension::GetDefaultIcon(true); |
model_->Add(insert_index, item); |
DCHECK(id_to_item_map_.find(id) == id_to_item_map_.end()); |
@@ -213,7 +213,7 @@ void ChromeLauncherDelegate::ConvertTabbedToApp(ash::LauncherID id, |
id_to_item_map_[id].app_type = app_type; |
id_to_item_map_[id].app_id = app_id; |
- ash::LauncherItem item(ash::TYPE_APP); |
+ ash::LauncherItem item(ash::TYPE_APP, false); |
item.id = id; |
model_->Set(model_->ItemIndexByID(id), item); |