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

Unified Diff: content/shell/android/shell_descriptors.h

Issue 10693157: Add pak file support for content shell and android apks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/android/shell_descriptors.h
diff --git a/ipc/ipc_descriptors.h b/content/shell/android/shell_descriptors.h
similarity index 50%
copy from ipc/ipc_descriptors.h
copy to content/shell/android/shell_descriptors.h
index 5717aa4e8f3983bb569ad9a323f57c1f613615f8..73ebbd62a2f751c674745609f3602e8c4ddbd0ae 100644
--- a/ipc/ipc_descriptors.h
+++ b/content/shell/android/shell_descriptors.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef IPC_IPC_DESCRIPTORS_H_
-#define IPC_IPC_DESCRIPTORS_H_
+#ifndef CONTENT_SHELL_ANDROID_SHELL_DESCRIPTORS_H_
+#define CONTENT_SHELL_ANDROID_SHELL_DESCRIPTORS_H_
// This is a list of global descriptor keys to be used with the
// base::GlobalDescriptors object (see base/global_descriptors_posix.h)
enum {
- kPrimaryIPCChannel = 0,
+ kShellPakDescriptor = 1,
};
-#endif // IPC_IPC_DESCRIPTORS_H_
+#endif // CONTENT_SHELL_ANDROID_SHELL_DESCRIPTORS_H_

Powered by Google App Engine
This is Rietveld 408576698