diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 15:09:12 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 15:09:12 +0000 |
| commit | 1602cde709fd963722d0a8e6422cc39080bfaed9 (patch) | |
| tree | ad73d52d733f91f7ba812eeae49a24b626735bc5 /content | |
| parent | 4649b3757c24b2d98d3aa88e2b06829ddd0ddadf (diff) | |
| download | chromium_src-1602cde709fd963722d0a8e6422cc39080bfaed9.zip chromium_src-1602cde709fd963722d0a8e6422cc39080bfaed9.tar.gz chromium_src-1602cde709fd963722d0a8e6422cc39080bfaed9.tar.bz2 | |
Rename back _linuxish to linux.
_linuxish is ambiguous. Use 'target_conditions' to include the required files
that are for linux on Android.
(TBR because the changes in chrome/browser/ui/gtk and content/app/android are all simple changes of #include file names)
BUG=none
TEST=Build successfully
TBR=erg@chromium.org,jrg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10532178
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/app/android/sandboxed_process_service.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/content/app/android/sandboxed_process_service.cc b/content/app/android/sandboxed_process_service.cc index e36d713..7c87d71 100644 --- a/content/app/android/sandboxed_process_service.cc +++ b/content/app/android/sandboxed_process_service.cc @@ -7,10 +7,8 @@ #include "base/global_descriptors_posix.h" #include "base/logging.h" #include "content/common/android/surface_texture_peer.h" -#if !defined(ANDROID_UPSTREAM_BRINGUP) -#include "content/common/chrome_descriptors.h" -#endif #include "content/public/app/android_library_loader_hooks.h" +#include "content/public/common/content_descriptors.h" #include "ipc/ipc_descriptors.h" #include "jni/sandboxed_process_service_jni.h" |