chrome/browser/extensions/extension_sync_bundle.cc - Issue 17038002: Separate the NTP app ordering from the app list app ordering

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/extension_sync_bundle.cc

Issue 17038002: Separate the NTP app ordering from the app list app ordering (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rework Created 7 years, 5 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/extensions/extension_service.cc ('k') | chrome/browser/extensions/install_observer.h » ('j') | chrome/browser/sync/test/integration/two_client_apps_sync_test.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/extensions/extension_sync_bundle.h"	5 #include "chrome/browser/extensions/extension_sync_bundle.h"

6	6

7 #include "base/location.h"	7 #include "base/location.h"

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

9 #include "chrome/browser/extensions/extension_sorting.h"

10 #include "chrome/common/extensions/extension.h"	9 #include "chrome/common/extensions/extension.h"

11 #include "chrome/common/extensions/extension_set.h"	10 #include "chrome/common/extensions/extension_set.h"

12 #include "chrome/common/extensions/sync_helper.h"	11 #include "chrome/common/extensions/sync_helper.h"

13 #include "sync/api/sync_change_processor.h"	12 #include "sync/api/sync_change_processor.h"

14 #include "sync/api/sync_error_factory.h"	13 #include "sync/api/sync_error_factory.h"

15	14

16 namespace extensions {	15 namespace extensions {

17	16

18 ExtensionSyncBundle::ExtensionSyncBundle(ExtensionService* extension_service)	17 ExtensionSyncBundle::ExtensionSyncBundle(ExtensionService* extension_service)

19 : extension_service_(extension_service) {}	18 : extension_service_(extension_service) {}

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
163 void ExtensionSyncBundle::RemoveExtension(const std::string& id) {	162 void ExtensionSyncBundle::RemoveExtension(const std::string& id) {

164 synced_extensions_.erase(id);	163 synced_extensions_.erase(id);

165 }	164 }

166	165

167 void ExtensionSyncBundle::MarkPendingExtensionSynced(const std::string& id) {	166 void ExtensionSyncBundle::MarkPendingExtensionSynced(const std::string& id) {

168 pending_sync_data_.erase(id);	167 pending_sync_data_.erase(id);

169 synced_extensions_.insert(id);	168 synced_extensions_.insert(id);

170 }	169 }

171	170

172 } // namespace extensions	171 } // namespace extensions

OLD	NEW