Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

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

Issue 46853004: Move ExtensionPrefs and friends to extensions/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and update app_shell Created 6 years, 11 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 | Annotate | Revision Log
OLDNEW
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 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 if (item_type == sync_pb::AppListSpecifics::TYPE_REMOVE_DEFAULT_APP) { 651 if (item_type == sync_pb::AppListSpecifics::TYPE_REMOVE_DEFAULT_APP) {
652 res += " { RemoveDefault }"; 652 res += " { RemoveDefault }";
653 } else { 653 } else {
654 res += " { " + item_name + " }"; 654 res += " { " + item_name + " }";
655 res += " [" + item_ordinal.ToDebugString() + "]"; 655 res += " [" + item_ordinal.ToDebugString() + "]";
656 } 656 }
657 return res; 657 return res;
658 } 658 }
659 659
660 } // namespace app_list 660 } // namespace app_list
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu_unittest.cc ('k') | chrome/browser/ui/app_list/extension_app_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698