chrome/browser/ui/app_list/app_list_syncable_service.cc - Issue 2401223002: [Sync] Renaming sync/api* to sync/model*.

Side by Side Diff: chrome/browser/ui/app_list/app_list_syncable_service.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)

Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 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:

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"

11 #include "base/memory/ptr_util.h"	11 #include "base/memory/ptr_util.h"

12 #include "base/stl_util.h"	12 #include "base/stl_util.h"

13 #include "base/strings/string_util.h"	13 #include "base/strings/string_util.h"

14 #include "build/build_config.h"	14 #include "build/build_config.h"

15 #include "chrome/browser/apps/drive/drive_app_provider.h"	15 #include "chrome/browser/apps/drive/drive_app_provider.h"

16 #include "chrome/browser/extensions/extension_service.h"	16 #include "chrome/browser/extensions/extension_service.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/ui/app_list/app_list_prefs.h"	18 #include "chrome/browser/ui/app_list/app_list_prefs.h"

19 #include "chrome/browser/ui/app_list/app_list_service.h"	19 #include "chrome/browser/ui/app_list/app_list_service.h"

20 #include "chrome/browser/ui/app_list/extension_app_item.h"	20 #include "chrome/browser/ui/app_list/extension_app_item.h"

21 #include "chrome/browser/ui/app_list/extension_app_model_builder.h"	21 #include "chrome/browser/ui/app_list/extension_app_model_builder.h"

22 #include "chrome/browser/ui/app_list/model_pref_updater.h"	22 #include "chrome/browser/ui/app_list/model_pref_updater.h"

23 #include "chrome/common/chrome_switches.h"	23 #include "chrome/common/chrome_switches.h"

24 #include "chrome/common/extensions/extension_constants.h"	24 #include "chrome/common/extensions/extension_constants.h"

25 #include "chrome/grit/generated_resources.h"	25 #include "chrome/grit/generated_resources.h"

26 #include "components/sync/api/sync_change_processor.h"	26 #include "components/sync/model/sync_change_processor.h"

27 #include "components/sync/api/sync_data.h"	27 #include "components/sync/model/sync_data.h"

28 #include "components/sync/api/sync_merge_result.h"	28 #include "components/sync/model/sync_merge_result.h"

29 #include "components/sync/protocol/sync.pb.h"	29 #include "components/sync/protocol/sync.pb.h"

30 #include "extensions/browser/extension_prefs.h"	30 #include "extensions/browser/extension_prefs.h"

31 #include "extensions/browser/extension_system.h"	31 #include "extensions/browser/extension_system.h"

32 #include "extensions/browser/uninstall_reason.h"	32 #include "extensions/browser/uninstall_reason.h"

33 #include "extensions/common/constants.h"	33 #include "extensions/common/constants.h"

34 #include "ui/app_list/app_list_folder_item.h"	34 #include "ui/app_list/app_list_folder_item.h"

35 #include "ui/app_list/app_list_item.h"	35 #include "ui/app_list/app_list_item.h"

36 #include "ui/app_list/app_list_model.h"	36 #include "ui/app_list/app_list_model.h"

37 #include "ui/app_list/app_list_model_observer.h"	37 #include "ui/app_list/app_list_model_observer.h"

38 #include "ui/app_list/app_list_switches.h"	38 #include "ui/app_list/app_list_switches.h"

(...skipping 1035 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1074 res += " { " + item_name + " }";	1074 res += " { " + item_name + " }";

1075 res += " [" + item_ordinal.ToDebugString() + "]";	1075 res += " [" + item_ordinal.ToDebugString() + "]";

1076 if (!parent_id.empty())	1076 if (!parent_id.empty())

1077 res += " <" + parent_id.substr(0, 8) + ">";	1077 res += " <" + parent_id.substr(0, 8) + ">";

1078 res += " [" + item_pin_ordinal.ToDebugString() + "]";	1078 res += " [" + item_pin_ordinal.ToDebugString() + "]";

1079 }	1079 }

1080 return res;	1080 return res;

1081 }	1081 }

1082	1082

1083 } // namespace app_list	1083 } // namespace app_list

OLD	NEW