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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | 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/apps/drive/drive_app_provider.h" 8 #include "chrome/browser/apps/drive/drive_app_provider.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.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_service.h" 12 #include "chrome/browser/ui/app_list/app_list_service.h"
13 #include "chrome/browser/ui/app_list/extension_app_item.h" 13 #include "chrome/browser/ui/app_list/extension_app_item.h"
14 #include "chrome/browser/ui/app_list/extension_app_model_builder.h" 14 #include "chrome/browser/ui/app_list/extension_app_model_builder.h"
15 #include "chrome/browser/ui/host_desktop.h" 15 #include "chrome/browser/ui/host_desktop.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/extensions/extension_constants.h" 17 #include "chrome/common/extensions/extension_constants.h"
18 #include "chrome/grit/generated_resources.h"
18 #include "content/public/browser/notification_source.h" 19 #include "content/public/browser/notification_source.h"
19 #include "extensions/browser/extension_prefs.h" 20 #include "extensions/browser/extension_prefs.h"
20 #include "extensions/browser/extension_system.h" 21 #include "extensions/browser/extension_system.h"
21 #include "extensions/browser/uninstall_reason.h" 22 #include "extensions/browser/uninstall_reason.h"
22 #include "grit/generated_resources.h"
23 #include "sync/api/sync_change_processor.h" 23 #include "sync/api/sync_change_processor.h"
24 #include "sync/api/sync_data.h" 24 #include "sync/api/sync_data.h"
25 #include "sync/api/sync_merge_result.h" 25 #include "sync/api/sync_merge_result.h"
26 #include "sync/protocol/sync.pb.h" 26 #include "sync/protocol/sync.pb.h"
27 #include "ui/app_list/app_list_folder_item.h" 27 #include "ui/app_list/app_list_folder_item.h"
28 #include "ui/app_list/app_list_item.h" 28 #include "ui/app_list/app_list_item.h"
29 #include "ui/app_list/app_list_model.h" 29 #include "ui/app_list/app_list_model.h"
30 #include "ui/app_list/app_list_model_observer.h" 30 #include "ui/app_list/app_list_model_observer.h"
31 #include "ui/app_list/app_list_switches.h" 31 #include "ui/app_list/app_list_switches.h"
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 } else { 912 } else {
913 res += " { " + item_name + " }"; 913 res += " { " + item_name + " }";
914 res += " [" + item_ordinal.ToDebugString() + "]"; 914 res += " [" + item_ordinal.ToDebugString() + "]";
915 if (!parent_id.empty()) 915 if (!parent_id.empty())
916 res += " <" + parent_id.substr(0, 8) + ">"; 916 res += " <" + parent_id.substr(0, 8) + ">";
917 } 917 }
918 return res; 918 return res;
919 } 919 }
920 920
921 } // namespace app_list 921 } // namespace app_list
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_mac.mm ('k') | chrome/browser/ui/app_list/search/people/people_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698