trunk/src/chrome/common/descriptors_android.h - Issue 22557005: Revert 216822 "Remove chrome.pak references, build resources int..."

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: trunk/src/chrome/common/descriptors_android.h

Issue 22557005: Revert 216822 "Remove chrome.pak references, build resources int..." (Closed) Base URL: svn://svn.chromium.org/chrome/

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

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_COMMON_DESCRIPTORS_ANDROID_H_	5 #ifndef CHROME_COMMON_DESCRIPTORS_ANDROID_H_

6 #define CHROME_COMMON_DESCRIPTORS_ANDROID_H_	6 #define CHROME_COMMON_DESCRIPTORS_ANDROID_H_

7	7

8 #include "content/public/common/content_descriptors.h"	8 #include "content/public/common/content_descriptors.h"

9	9

10 enum {	10 enum {

11 #if defined(OS_ANDROID)	11 #if defined(OS_ANDROID)

12 kAndroidLocalePakDescriptor = kContentIPCDescriptorMax + 1,	12 kAndroidChromePakDescriptor = kContentIPCDescriptorMax + 1,

	13 kAndroidLocalePakDescriptor,

13 kAndroidChrome100PercentPakDescriptor,	14 kAndroidChrome100PercentPakDescriptor,

14 kAndroidUIResourcesPakDescriptor,	15 kAndroidUIResourcesPakDescriptor,

15 kAndroidMinidumpDescriptor,	16 kAndroidMinidumpDescriptor,

16 #endif	17 #endif

17 };	18 };

18	19

19 #endif // CHROME_COMMON_DESCRIPTORS_ANDROID_H_	20 #endif // CHROME_COMMON_DESCRIPTORS_ANDROID_H_

OLD	NEW