chrome/browser/sync/test/integration/apps_helper.h - Issue 11299326: Revert 170660

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/test/integration/apps_helper.h

Issue 11299326: Revert 170660 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years 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

« no previous file with comments | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/sync/test/integration/apps_helper.cc » ('j') | no next file with comments »

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 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_	5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_

6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_	6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_

7	7

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

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

10 #include "chrome/browser/sync/test/integration/sync_test.h"	10 #include "chrome/browser/sync/test/integration/sync_test.h"

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77	77

78 // Copy the page and app launch ordinal value for the application at the given	78 // Copy the page and app launch ordinal value for the application at the given

79 // index on \|profile_source\| to \|profile_destination\|.	79 // index on \|profile_source\| to \|profile_destination\|.

80 // The main intention of this is to properly setup the values on the verifier	80 // The main intention of this is to properly setup the values on the verifier

81 // profile in situations where the other profiles have conflicting values.	81 // profile in situations where the other profiles have conflicting values.

82 void CopyNTPOrdinals(Profile* source, Profile* destination, int index);	82 void CopyNTPOrdinals(Profile* source, Profile* destination, int index);

83	83

84 // Fix any NTP icon collisions that are currently in \|profile\|.	84 // Fix any NTP icon collisions that are currently in \|profile\|.

85 void FixNTPOrdinalCollisions(Profile* profile);	85 void FixNTPOrdinalCollisions(Profile* profile);

86	86

87 // Wait until there are no lazy background pages loaded.

88 // This needs to be done before exiting tests which installed platform apps.

89 void WaitForPlatformAppsToUnload();

90

91 } // namespace apps_helper	87 } // namespace apps_helper

92	88

93 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_	89 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_

OLD	NEW