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

Side by Side Diff: chrome/common/chrome_result_codes.h

Issue 927163002: Now command line flag does not beat Policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test for chromeos and rebase Created 5 years, 8 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/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_COMMON_CHROME_RESULT_CODES_H_ 5 #ifndef CHROME_COMMON_CHROME_RESULT_CODES_H_
6 #define CHROME_COMMON_CHROME_RESULT_CODES_H_ 6 #define CHROME_COMMON_CHROME_RESULT_CODES_H_
7 7
8 #include "content/public/common/result_codes.h" 8 #include "content/public/common/result_codes.h"
9 9
10 namespace chrome { 10 namespace chrome {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 // A dummy value we should not use. See crbug.com/152285. 82 // A dummy value we should not use. See crbug.com/152285.
83 RESULT_CODE_NOTUSED_2, 83 RESULT_CODE_NOTUSED_2,
84 84
85 // Returned when the user has not yet accepted the EULA. 85 // Returned when the user has not yet accepted the EULA.
86 RESULT_CODE_EULA_REFUSED, 86 RESULT_CODE_EULA_REFUSED,
87 87
88 // Failed to migrate user data directory for side-by-side package support 88 // Failed to migrate user data directory for side-by-side package support
89 // (Linux-only). 89 // (Linux-only).
90 RESULT_CODE_SXS_MIGRATION_FAILED, 90 RESULT_CODE_SXS_MIGRATION_FAILED,
91 91
92 // The action is not allowed by a policy.
93 RESULT_CODE_ACTION_DISALLOWED_BY_POLICY,
94
92 // Last return code (keep this last). 95 // Last return code (keep this last).
93 RESULT_CODE_CHROME_LAST_CODE, 96 RESULT_CODE_CHROME_LAST_CODE,
94 }; 97 };
95 98
96 } // namespace chrome 99 } // namespace chrome
97 100
98 #endif // CHROME_COMMON_CHROME_RESULT_CODES_H_ 101 #endif // CHROME_COMMON_CHROME_RESULT_CODES_H_
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698