| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/extensions/extension_prefs.h" | |
| 10 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 11 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/ui/app_list/app_list_service.h" | 12 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 14 #include "chrome/browser/ui/app_list/extension_app_item.h" | 13 #include "chrome/browser/ui/app_list/extension_app_item.h" |
| 15 #include "chrome/browser/ui/app_list/extension_app_model_builder.h" | 14 #include "chrome/browser/ui/app_list/extension_app_model_builder.h" |
| 16 #include "chrome/browser/ui/host_desktop.h" | 15 #include "chrome/browser/ui/host_desktop.h" |
| 17 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 18 #include "content/public/browser/notification_source.h" | 17 #include "content/public/browser/notification_source.h" |
| 18 #include "extensions/browser/extension_prefs.h" |
| 19 #include "sync/api/sync_change_processor.h" | 19 #include "sync/api/sync_change_processor.h" |
| 20 #include "sync/api/sync_data.h" | 20 #include "sync/api/sync_data.h" |
| 21 #include "sync/api/sync_merge_result.h" | 21 #include "sync/api/sync_merge_result.h" |
| 22 #include "sync/protocol/sync.pb.h" | 22 #include "sync/protocol/sync.pb.h" |
| 23 #include "ui/app_list/app_list_folder_item.h" | 23 #include "ui/app_list/app_list_folder_item.h" |
| 24 #include "ui/app_list/app_list_item.h" | 24 #include "ui/app_list/app_list_item.h" |
| 25 #include "ui/app_list/app_list_model.h" | 25 #include "ui/app_list/app_list_model.h" |
| 26 | 26 |
| 27 using syncer::SyncChange; | 27 using syncer::SyncChange; |
| 28 | 28 |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 if (item_type == sync_pb::AppListSpecifics::TYPE_REMOVE_DEFAULT_APP) { | 566 if (item_type == sync_pb::AppListSpecifics::TYPE_REMOVE_DEFAULT_APP) { |
| 567 res += " { RemoveDefault }"; | 567 res += " { RemoveDefault }"; |
| 568 } else { | 568 } else { |
| 569 res += " { " + item_name + " }"; | 569 res += " { " + item_name + " }"; |
| 570 res += " [" + item_ordinal.ToDebugString() + "]"; | 570 res += " [" + item_ordinal.ToDebugString() + "]"; |
| 571 } | 571 } |
| 572 return res; | 572 return res; |
| 573 } | 573 } |
| 574 | 574 |
| 575 } // namespace app_list | 575 } // namespace app_list |
| OLD | NEW |