chrome/browser/sync/glue/app_model_associator.h - Issue 7692003: Revert 97482 - Apps/Extensions Sync refactoring -- delete most of the old glue, implement new syn...

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/sync/glue/app_model_associator.h

Issue 7692003: Revert 97482 - Apps/Extensions Sync refactoring -- delete most of the old glue, implement new syn... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 4 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

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « chrome/browser/sync/glue/app_change_processor.cc ('k') | chrome/browser/sync/glue/app_model_associator.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_	5 #ifndef CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_

6 #define CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_	6 #define CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

10 #include "chrome/browser/sync/glue/extension_sync_traits.h"	10 #include "chrome/browser/sync/glue/extension_sync_traits.h"

(...skipping 30 matching lines...) Expand all Loading...
41 const ExtensionSyncTraits traits_;	41 const ExtensionSyncTraits traits_;

42 ExtensionServiceInterface* const extension_service_;	42 ExtensionServiceInterface* const extension_service_;

43 sync_api::UserShare* const user_share_;	43 sync_api::UserShare* const user_share_;

44	44

45 DISALLOW_COPY_AND_ASSIGN(AppModelAssociator);	45 DISALLOW_COPY_AND_ASSIGN(AppModelAssociator);

46 };	46 };

47	47

48 } // namespace browser_sync	48 } // namespace browser_sync

49	49

50 #endif // CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_	50 #endif // CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_

OLD	NEW