app_list_model.cc revision 46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd
15821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)// Copyright (c) 2012 The Chromium Authors. All rights reserved. 25821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)// Use of this source code is governed by a BSD-style license that can be 35821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)// found in the LICENSE file. 45821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 55821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ui/app_list/app_list_model.h" 65821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 7a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles)#include <string> 8a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) 95d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)#include "ui/app_list/app_list_folder_item.h" 105d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)#include "ui/app_list/app_list_item.h" 115821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ui/app_list/app_list_model_observer.h" 125821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ui/app_list/search_box_model.h" 135821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ui/app_list/search_result.h" 145821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 155821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)namespace app_list { 165821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 175821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)AppListModel::AppListModel() 18a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) : top_level_item_list_(new AppListItemList), 195821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) search_box_(new SearchBoxModel), 205821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) results_(new SearchResults), 2146d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) status_(STATUS_NORMAL), 2246d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) folders_enabled_(false) { 23a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) top_level_item_list_->AddObserver(this); 245821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 255821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 26a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles)AppListModel::~AppListModel() { top_level_item_list_->RemoveObserver(this); } 275821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 285821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void AppListModel::AddObserver(AppListModelObserver* observer) { 295821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) observers_.AddObserver(observer); 305821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 315821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 325821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void AppListModel::RemoveObserver(AppListModelObserver* observer) { 335821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) observers_.RemoveObserver(observer); 345821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 355821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 365821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void AppListModel::SetStatus(Status status) { 375821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) if (status_ == status) 385821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) return; 395821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 405821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) status_ = status; 415821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 425821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) observers_, 435821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) OnAppListModelStatusChanged()); 445821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 455821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 465d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)AppListItem* AppListModel::FindItem(const std::string& id) { 47a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) AppListItem* item = top_level_item_list_->FindItem(id); 485d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (item) 495d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return item; 50a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) for (size_t i = 0; i < top_level_item_list_->item_count(); ++i) { 51a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) AppListItem* child_item = 52a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) top_level_item_list_->item_at(i)->FindChildItem(id); 535d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (child_item) 545d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return child_item; 555d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) } 565d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return NULL; 575d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 585d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 595d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)AppListFolderItem* AppListModel::FindFolderItem(const std::string& id) { 60a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) AppListItem* item = top_level_item_list_->FindItem(id); 615d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (item && item->GetItemType() == AppListFolderItem::kItemType) 625d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return static_cast<AppListFolderItem*>(item); 635d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK(!item); 645d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return NULL; 655d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 665d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 675d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)AppListItem* AppListModel::AddItem(scoped_ptr<AppListItem> item) { 685d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK(!item->IsInFolder()); 69a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) DCHECK(!top_level_item_list()->FindItem(item->id())); 705d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return AddItemToItemListAndNotify(item.Pass()); 715d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 725d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 735d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)AppListItem* AppListModel::AddItemToFolder(scoped_ptr<AppListItem> item, 745d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) const std::string& folder_id) { 755d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (folder_id.empty()) 765d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return AddItem(item.Pass()); 7723730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) DVLOG(2) << "AddItemToFolder: " << item->id() << ": " << folder_id; 785d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK(!item->IsInFolder() || item->folder_id() == folder_id); 795d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK(item->GetItemType() != AppListFolderItem::kItemType); 805d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* dest_folder = FindOrCreateFolderItem(folder_id); 8146d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) if (!dest_folder) 8246d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) return NULL; 8323730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) DCHECK(!dest_folder->item_list()->FindItem(item->id())) 8423730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) << "Already in folder: " << dest_folder->id(); 855d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return AddItemToFolderItemAndNotify(dest_folder, item.Pass()); 865d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 875d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 8823730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles)const std::string AppListModel::MergeItems(const std::string& target_item_id, 8923730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) const std::string& source_item_id) { 9046d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) if (!folders_enabled()) { 9146d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) LOG(ERROR) << "MergeItems called with folders disabled."; 9246d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) return ""; 9346d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) } 945d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DVLOG(2) << "MergeItems: " << source_item_id << " -> " << target_item_id; 9523730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) // Find the target item. 965d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListItem* target_item = FindItem(target_item_id); 97c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch if (!target_item) { 98c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch LOG(ERROR) << "MergeItems: Target no longer exists."; 99c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch return ""; 100c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch } 101c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch CHECK(target_item->folder_id().empty()); 102c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch 103c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch AppListItem* source_item = FindItem(source_item_id); 104c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch if (!source_item) { 105c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch LOG(ERROR) << "MergeItems: Source no longer exists."; 106c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch return ""; 107c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch } 1085d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 10923730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) // If the target item is a folder, just add the source item to it. 1105d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (target_item->GetItemType() == AppListFolderItem::kItemType) { 1115d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* target_folder = 1125d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) static_cast<AppListFolderItem*>(target_item); 11323730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) if (target_folder->folder_type() == AppListFolderItem::FOLDER_TYPE_OEM) { 11423730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) LOG(WARNING) << "MergeItems called with OEM folder as target"; 11523730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) return ""; 11623730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) } 117c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch scoped_ptr<AppListItem> source_item_ptr = RemoveItem(source_item); 1185d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) source_item_ptr->set_position( 1195d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) target_folder->item_list()->CreatePositionBefore( 1205d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) syncer::StringOrdinal())); 1215d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToFolderItemAndNotify(target_folder, source_item_ptr.Pass()); 1225d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return target_folder->id(); 1235d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) } 1245d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 12523730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) // Otherwise remove the source item and target item from their current 12623730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) // location, they will become owned by the new folder. 127c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch scoped_ptr<AppListItem> source_item_ptr = RemoveItem(source_item); 128c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch CHECK(source_item_ptr); 1295d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) scoped_ptr<AppListItem> target_item_ptr = 130a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) top_level_item_list_->RemoveItem(target_item_id); 131c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch CHECK(target_item_ptr); 1325d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 1335d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) // Create a new folder in the same location as the target item. 134a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) std::string new_folder_id = AppListFolderItem::GenerateId(); 135a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) DVLOG(2) << "Creating folder for merge: " << new_folder_id; 13623730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) scoped_ptr<AppListItem> new_folder_ptr(new AppListFolderItem( 13723730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) new_folder_id, AppListFolderItem::FOLDER_TYPE_NORMAL)); 138c5cede9ae108bb15f6b7a8aea21c7e1fefa2834cBen Murdoch new_folder_ptr->set_position(target_item_ptr->position()); 1395d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* new_folder = static_cast<AppListFolderItem*>( 1405d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToItemListAndNotify(new_folder_ptr.Pass())); 1415d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 1425d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) // Add the items to the new folder. 1435d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) target_item_ptr->set_position( 1445d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) new_folder->item_list()->CreatePositionBefore( 1455d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) syncer::StringOrdinal())); 1465d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToFolderItemAndNotify(new_folder, target_item_ptr.Pass()); 1475d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) source_item_ptr->set_position( 1485d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) new_folder->item_list()->CreatePositionBefore( 1495d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) syncer::StringOrdinal())); 1505d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToFolderItemAndNotify(new_folder, source_item_ptr.Pass()); 1515d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 1525d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return new_folder->id(); 1535d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 1545d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 1555d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)void AppListModel::MoveItemToFolder(AppListItem* item, 1565d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) const std::string& folder_id) { 1575d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DVLOG(2) << "MoveItemToFolder: " << folder_id 1585d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) << " <- " << item->ToDebugString(); 1595d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (item->folder_id() == folder_id) 1605d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return; 1615d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* dest_folder = FindOrCreateFolderItem(folder_id); 1625d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) scoped_ptr<AppListItem> item_ptr = RemoveItem(item); 1635d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (dest_folder) 1645d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToFolderItemAndNotify(dest_folder, item_ptr.Pass()); 1655d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) else 1665d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToItemListAndNotifyUpdate(item_ptr.Pass()); 1675d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 1685d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 16923730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles)bool AppListModel::MoveItemToFolderAt(AppListItem* item, 1705d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) const std::string& folder_id, 1715d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) syncer::StringOrdinal position) { 1725d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DVLOG(2) << "MoveItemToFolderAt: " << folder_id 1735d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) << "[" << position.ToDebugString() << "]" 1745d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) << " <- " << item->ToDebugString(); 1755d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (item->folder_id() == folder_id) 17623730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) return false; 17723730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) AppListFolderItem* src_folder = FindOrCreateFolderItem(item->folder_id()); 17823730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) if (src_folder && 17923730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) src_folder->folder_type() == AppListFolderItem::FOLDER_TYPE_OEM) { 18023730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) LOG(WARNING) << "MoveItemToFolderAt called with OEM folder as source"; 18123730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) return false; 18223730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) } 1835d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* dest_folder = FindOrCreateFolderItem(folder_id); 1845d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) scoped_ptr<AppListItem> item_ptr = RemoveItem(item); 1855d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (dest_folder) { 1865d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) item_ptr->set_position( 1875d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) dest_folder->item_list()->CreatePositionBefore(position)); 1885d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToFolderItemAndNotify(dest_folder, item_ptr.Pass()); 1895d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) } else { 190a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) item_ptr->set_position( 191a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) top_level_item_list_->CreatePositionBefore(position)); 1925d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToItemListAndNotifyUpdate(item_ptr.Pass()); 1935d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) } 19423730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) return true; 1955d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 1965d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 1975d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)void AppListModel::SetItemPosition(AppListItem* item, 1985d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) const syncer::StringOrdinal& new_position) { 1995d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (!item->IsInFolder()) { 200a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) top_level_item_list_->SetItemPosition(item, new_position); 2015d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) // Note: this will trigger OnListItemMoved which will signal observers. 2025d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) // (This is done this way because some View code still moves items within 2035d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) // the item list directly). 2045d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return; 2055d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) } 2065d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* folder = FindFolderItem(item->folder_id()); 2075d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK(folder); 2085d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) folder->item_list()->SetItemPosition(item, new_position); 2095d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 2105d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) observers_, 2115d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) OnAppListItemUpdated(item)); 2125d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 2135d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 214a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles)void AppListModel::SetItemName(AppListItem* item, const std::string& name) { 215a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) item->SetName(name); 216a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) DVLOG(2) << "AppListModel::SetItemName: " << item->ToDebugString(); 217a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 218a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) observers_, 219a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) OnAppListItemUpdated(item)); 220a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles)} 221a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) 222a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles)void AppListModel::SetItemNameAndShortName(AppListItem* item, 223a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) const std::string& name, 224a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) const std::string& short_name) { 225a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) item->SetNameAndShortName(name, short_name); 226a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) DVLOG(2) << "AppListModel::SetItemNameAndShortName: " 227a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) << item->ToDebugString(); 228a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 229a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) observers_, 230a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) OnAppListItemUpdated(item)); 231a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles)} 232a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) 2335d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)void AppListModel::DeleteItem(const std::string& id) { 2345d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListItem* item = FindItem(id); 2355d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (!item) 2365d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return; 2375d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (!item->IsInFolder()) { 2385d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK_EQ(0u, item->ChildItemCount()) 2395d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) << "Invalid call to DeleteItem for item with children: " << id; 2405d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 2415d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) observers_, 2425d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) OnAppListItemWillBeDeleted(item)); 243a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) top_level_item_list_->DeleteItem(id); 244cedac228d2dd51db4b79ea1e72c7f249408ee061Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, observers_, OnAppListItemDeleted()); 2455d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return; 2465d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) } 2475d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* folder = FindFolderItem(item->folder_id()); 2485d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK(folder) << "Folder not found for item: " << item->ToDebugString(); 2495d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) scoped_ptr<AppListItem> child_item = RemoveItemFromFolder(folder, item); 2505d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK_EQ(item, child_item.get()); 2515d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 2525d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) observers_, 2535d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) OnAppListItemWillBeDeleted(item)); 2545d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) child_item.reset(); // Deletes item. 255cedac228d2dd51db4b79ea1e72c7f249408ee061Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, observers_, OnAppListItemDeleted()); 2565d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 2575d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 258a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles)void AppListModel::NotifyExtensionPreferenceChanged() { 259a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) for (size_t i = 0; i < top_level_item_list_->item_count(); ++i) 260a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) top_level_item_list_->item_at(i)->OnExtensionPreferenceChanged(); 261a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles)} 262a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) 26346d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles)void AppListModel::SetFoldersEnabled(bool folders_enabled) { 26446d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) folders_enabled_ = folders_enabled; 26546d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) if (folders_enabled) 26646d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) return; 26746d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) // Remove child items from folders. 26846d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) std::vector<std::string> folder_ids; 26946d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) for (size_t i = 0; i < top_level_item_list_->item_count(); ++i) { 27046d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) AppListItem* item = top_level_item_list_->item_at(i); 27146d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) if (item->GetItemType() != AppListFolderItem::kItemType) 27246d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) continue; 27346d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) AppListFolderItem* folder = static_cast<AppListFolderItem*>(item); 27446d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) if (folder->folder_type() == AppListFolderItem::FOLDER_TYPE_OEM) 27546d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) continue; // Do not remove OEM folders. 27646d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) while (folder->item_list()->item_count()) { 27746d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) scoped_ptr<AppListItem> child = folder->item_list()->RemoveItemAt(0); 27846d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) child->set_folder_id(""); 27946d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) AddItemToItemListAndNotifyUpdate(child.Pass()); 28046d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) } 28146d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) folder_ids.push_back(folder->id()); 28246d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) } 28346d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) // Delete folders. 28446d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) for (size_t i = 0; i < folder_ids.size(); ++i) 28546d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) DeleteItem(folder_ids[i]); 28646d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles)} 28746d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) 2885d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)// Private methods 2895d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 2905d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)void AppListModel::OnListItemMoved(size_t from_index, 2915d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) size_t to_index, 2925d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListItem* item) { 2935d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 2945d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) observers_, 2955d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) OnAppListItemUpdated(item)); 2965d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 2975d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 2985d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)AppListFolderItem* AppListModel::FindOrCreateFolderItem( 2995d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) const std::string& folder_id) { 3005d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (folder_id.empty()) 3015d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return NULL; 3025d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 3035d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* dest_folder = FindFolderItem(folder_id); 3045d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (dest_folder) 3055d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return dest_folder; 3065d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 30746d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) if (!folders_enabled()) { 30846d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) LOG(ERROR) << "Attempt to create folder item when disabled: " << folder_id; 30946d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) return NULL; 31046d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) } 31146d4c2bc3267f3f028f39e7e311b0f89aba2e4fdTorne (Richard Coles) 312a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) DVLOG(2) << "Creating new folder: " << folder_id; 31323730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) scoped_ptr<AppListFolderItem> new_folder( 31423730a6e56a168d1879203e4b3819bb36e3d8f1fTorne (Richard Coles) new AppListFolderItem(folder_id, AppListFolderItem::FOLDER_TYPE_NORMAL)); 3155d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) new_folder->set_position( 316a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) top_level_item_list_->CreatePositionBefore(syncer::StringOrdinal())); 3175d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListItem* new_folder_item = 3185d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AddItemToItemListAndNotify(new_folder.PassAs<AppListItem>()); 3195d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return static_cast<AppListFolderItem*>(new_folder_item); 3205d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 3215d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 3225d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)AppListItem* AppListModel::AddItemToItemListAndNotify( 3235d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) scoped_ptr<AppListItem> item_ptr) { 3245d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK(!item_ptr->IsInFolder()); 325a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) AppListItem* item = top_level_item_list_->AddItem(item_ptr.Pass()); 3265d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 3275d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) observers_, 3285d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) OnAppListItemAdded(item)); 3295d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return item; 3305d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 3315d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 3325d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)AppListItem* AppListModel::AddItemToItemListAndNotifyUpdate( 3335d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) scoped_ptr<AppListItem> item_ptr) { 3345d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK(!item_ptr->IsInFolder()); 335a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) AppListItem* item = top_level_item_list_->AddItem(item_ptr.Pass()); 3365d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 3375d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) observers_, 3385d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) OnAppListItemUpdated(item)); 3395d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return item; 3405d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 3415d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 3425d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)AppListItem* AppListModel::AddItemToFolderItemAndNotify( 3435d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* folder, 3445d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) scoped_ptr<AppListItem> item_ptr) { 3455d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListItem* item = folder->item_list()->AddItem(item_ptr.Pass()); 3465d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) item->set_folder_id(folder->id()); 3475d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) FOR_EACH_OBSERVER(AppListModelObserver, 3485d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) observers_, 3495d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) OnAppListItemUpdated(item)); 3505d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return item; 3515d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 3525d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 3535d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)scoped_ptr<AppListItem> AppListModel::RemoveItem(AppListItem* item) { 3545d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (!item->IsInFolder()) 355a1401311d1ab56c4ed0a474bd38c108f75cb0cd9Torne (Richard Coles) return top_level_item_list_->RemoveItem(item->id()); 3565d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 3575d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* folder = FindFolderItem(item->folder_id()); 3585d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return RemoveItemFromFolder(folder, item); 3595d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 3605d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 3615d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)scoped_ptr<AppListItem> AppListModel::RemoveItemFromFolder( 3625d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListFolderItem* folder, 3635d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) AppListItem* item) { 3645d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) std::string folder_id = folder->id(); 3655d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DCHECK_EQ(item->folder_id(), folder_id); 3665d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) scoped_ptr<AppListItem> result = folder->item_list()->RemoveItem(item->id()); 3675d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) result->set_folder_id(""); 3685d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) if (folder->item_list()->item_count() == 0) { 3695d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DVLOG(2) << "Deleting empty folder: " << folder->ToDebugString(); 3705d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) DeleteItem(folder_id); 3715d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) } 3725d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) return result.Pass(); 3735d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles)} 3745d1f7b1de12d16ceb2c938c56701a3e8bfa558f7Torne (Richard Coles) 3755821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} // namespace app_list 376