chrome/common/pref_names.h - Issue 3181001: Fix build break due to bad merge.

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/common/pref_names.h

Issue 3181001: Fix build break due to bad merge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 // Constants for the names of various preferences, for easier changing.	5 // Constants for the names of various preferences, for easier changing.

6	6

7 #ifndef CHROME_COMMON_PREF_NAMES_H_	7 #ifndef CHROME_COMMON_PREF_NAMES_H_

8 #define CHROME_COMMON_PREF_NAMES_H_	8 #define CHROME_COMMON_PREF_NAMES_H_

9 #pragma once	9 #pragma once

10	10

(...skipping 281 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
292 extern const char kNumFoldersInOtherBookmarkFolder[];	292 extern const char kNumFoldersInOtherBookmarkFolder[];

293	293

294 extern const char kNumKeywords[];	294 extern const char kNumKeywords[];

295	295

296 extern const char kDisableVideoAndChat[];	296 extern const char kDisableVideoAndChat[];

297	297

298 extern const char kDisableExtensions[];	298 extern const char kDisableExtensions[];

299 extern const char kShowExtensionShelf[];	299 extern const char kShowExtensionShelf[];

300 extern const char kBrowserActionContainerWidth[];	300 extern const char kBrowserActionContainerWidth[];

301	301

	302 extern const char kLastExtensionsUpdateCheck[];

	303 extern const char kNextExtensionsUpdateCheck[];

	304

302 extern const char kExtensionInstallAllowList[];	305 extern const char kExtensionInstallAllowList[];

303 extern const char kExtensionInstallDenyList[];	306 extern const char kExtensionInstallDenyList[];

304	307

305 extern const char kExtensionBlacklistUpdateVersion[];	308 extern const char kExtensionBlacklistUpdateVersion[];

306	309

307 extern const char kNTPMostVisitedURLsBlacklist[];	310 extern const char kNTPMostVisitedURLsBlacklist[];

308 extern const char kNTPMostVisitedPinnedURLs[];	311 extern const char kNTPMostVisitedPinnedURLs[];

309 extern const char kNTPTipsCache[];	312 extern const char kNTPTipsCache[];

310 extern const char kNTPTipsCacheUpdate[];	313 extern const char kNTPTipsCacheUpdate[];

311 extern const char kNTPTipsServer[];	314 extern const char kNTPTipsServer[];

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
350 extern const char kProxyAutoDetect[];	353 extern const char kProxyAutoDetect[];

351 extern const char kProxyServer[];	354 extern const char kProxyServer[];

352 extern const char kProxyPacUrl[];	355 extern const char kProxyPacUrl[];

353 extern const char kProxyBypassList[];	356 extern const char kProxyBypassList[];

354	357

355 extern const char kRegisteredBackgroundContents[];	358 extern const char kRegisteredBackgroundContents[];

356	359

357 } // namespace prefs	360 } // namespace prefs

358	361

359 #endif // CHROME_COMMON_PREF_NAMES_H_	362 #endif // CHROME_COMMON_PREF_NAMES_H_

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »