chrome/browser/ui/app_list/app_list_syncable_service.h - Issue 556403002: cros: Enable Drive apps integration in app launcher.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/app_list/app_list_syncable_service.h

Issue 556403002: cros: Enable Drive apps integration in app launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: restore enable-drive-apps-in-app-list in histograms.xml 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/apps/drive/drive_app_provider_browsertest.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_syncable_service.h

diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.h b/chrome/browser/ui/app_list/app_list_syncable_service.h

index d609214e36d15d9e696865bbfa13591bf6f11f5b..96b6aaf855d71eba00df730d2106c7650f3340e4 100644

--- a/chrome/browser/ui/app_list/app_list_syncable_service.h

+++ b/chrome/browser/ui/app_list/app_list_syncable_service.h

@@ -84,6 +84,7 @@ class AppListSyncableService : public syncer::SyncableService,

const std::string& GetOemFolderNameForTest() const {

return oem_folder_name_;

}

+ void ResetDriveAppProviderForTest();

// syncer::SyncableService

virtual syncer::SyncMergeResult MergeDataAndStartSyncing(