chrome/browser/ui/app_list/app_list_syncable_service.cc - Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h

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

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type

Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc ('k') | chrome/browser/ui/app_list/app_list_util.cc » ('j') | no next file with comments »

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 "base/strings/string_util.h"	8 #include "base/strings/string_util.h"

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

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

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

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

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

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

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

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

17 #include "chrome/browser/ui/host_desktop.h"

18 #include "chrome/common/chrome_switches.h"	17 #include "chrome/common/chrome_switches.h"

19 #include "chrome/common/extensions/extension_constants.h"	18 #include "chrome/common/extensions/extension_constants.h"

20 #include "chrome/grit/generated_resources.h"	19 #include "chrome/grit/generated_resources.h"

21 #include "extensions/browser/extension_prefs.h"	20 #include "extensions/browser/extension_prefs.h"

22 #include "extensions/browser/extension_system.h"	21 #include "extensions/browser/extension_system.h"

23 #include "extensions/browser/uninstall_reason.h"	22 #include "extensions/browser/uninstall_reason.h"

24 #include "extensions/common/constants.h"	23 #include "extensions/common/constants.h"

25 #include "sync/api/sync_change_processor.h"	24 #include "sync/api/sync_change_processor.h"

26 #include "sync/api/sync_data.h"	25 #include "sync/api/sync_data.h"

27 #include "sync/api/sync_merge_result.h"	26 #include "sync/api/sync_merge_result.h"

28 #include "sync/protocol/sync.pb.h"	27 #include "sync/protocol/sync.pb.h"

29 #include "ui/app_list/app_list_folder_item.h"	28 #include "ui/app_list/app_list_folder_item.h"

30 #include "ui/app_list/app_list_item.h"	29 #include "ui/app_list/app_list_item.h"

31 #include "ui/app_list/app_list_model.h"	30 #include "ui/app_list/app_list_model.h"

32 #include "ui/app_list/app_list_model_observer.h"	31 #include "ui/app_list/app_list_model_observer.h"

33 #include "ui/app_list/app_list_switches.h"	32 #include "ui/app_list/app_list_switches.h"

34 #include "ui/base/l10n/l10n_util.h"	33 #include "ui/base/l10n/l10n_util.h"

	34 #include "ui/gfx/host_desktop_type.h"

35	35

36 #if defined(OS_CHROMEOS)	36 #if defined(OS_CHROMEOS)

37 #include "chrome/browser/chromeos/file_manager/app_id.h"	37 #include "chrome/browser/chromeos/file_manager/app_id.h"

38 #include "chrome/browser/chromeos/genius_app/app_id.h"	38 #include "chrome/browser/chromeos/genius_app/app_id.h"

39 #endif	39 #endif

40	40

41 using syncer::SyncChange;	41 using syncer::SyncChange;

42	42

43 namespace app_list {	43 namespace app_list {

44	44

(...skipping 949 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
994 } else {	994 } else {

995 res += " { " + item_name + " }";	995 res += " { " + item_name + " }";

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

997 if (!parent_id.empty())	997 if (!parent_id.empty())

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

999 }	999 }

1000 return res;	1000 return res;

1001 }	1001 }

1002	1002

1003 } // namespace app_list	1003 } // namespace app_list

OLD	NEW