| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" | 5 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 DCHECK(!adding_item_); | 254 DCHECK(!adding_item_); |
| 255 VLOG(2) << owner_ << " OnAppListItemDeleted: " << item->ToDebugString(); | 255 VLOG(2) << owner_ << " OnAppListItemDeleted: " << item->ToDebugString(); |
| 256 // Don't sync folder removal in case the folder still exists on another | 256 // Don't sync folder removal in case the folder still exists on another |
| 257 // device (e.g. with device specific items in it). Empty folders will be | 257 // device (e.g. with device specific items in it). Empty folders will be |
| 258 // deleted when the last item is removed (in PruneEmptySyncFolders()). | 258 // deleted when the last item is removed (in PruneEmptySyncFolders()). |
| 259 if (item->GetItemType() == AppListFolderItem::kItemType) | 259 if (item->GetItemType() == AppListFolderItem::kItemType) |
| 260 return; | 260 return; |
| 261 | 261 |
| 262 #if defined(OS_CHROMEOS) | 262 #if defined(OS_CHROMEOS) |
| 263 if (item->GetItemType() == ArcAppItem::kItemType) { | 263 if (item->GetItemType() == ArcAppItem::kItemType) { |
| 264 // Don't sync remove changes coming as result of disabling Arc. | 264 // Don't sync remove changes coming as result of disabling ARC. |
| 265 const arc::ArcSessionManager* arc_session_manager = | 265 const arc::ArcSessionManager* arc_session_manager = |
| 266 arc::ArcSessionManager::Get(); | 266 arc::ArcSessionManager::Get(); |
| 267 DCHECK(arc_session_manager); | 267 DCHECK(arc_session_manager); |
| 268 if (!arc_session_manager->IsArcPlayStoreEnabled()) | 268 if (!arc_session_manager->IsArcPlayStoreEnabled()) |
| 269 return; | 269 return; |
| 270 } | 270 } |
| 271 #endif | 271 #endif |
| 272 | 272 |
| 273 owner_->RemoveSyncItem(item->id()); | 273 owner_->RemoveSyncItem(item->id()); |
| 274 } | 274 } |
| (...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1229 res += " { " + item_name + " }"; | 1229 res += " { " + item_name + " }"; |
| 1230 res += " [" + item_ordinal.ToDebugString() + "]"; | 1230 res += " [" + item_ordinal.ToDebugString() + "]"; |
| 1231 if (!parent_id.empty()) | 1231 if (!parent_id.empty()) |
| 1232 res += " <" + parent_id.substr(0, 8) + ">"; | 1232 res += " <" + parent_id.substr(0, 8) + ">"; |
| 1233 res += " [" + item_pin_ordinal.ToDebugString() + "]"; | 1233 res += " [" + item_pin_ordinal.ToDebugString() + "]"; |
| 1234 } | 1234 } |
| 1235 return res; | 1235 return res; |
| 1236 } | 1236 } |
| 1237 | 1237 |
| 1238 } // namespace app_list | 1238 } // namespace app_list |
| OLD | NEW |