diff options
| author | Sylvain Defresne <sdefresne@chromium.org> | 2014-09-19 12:19:35 +0200 |
|---|---|---|
| committer | Sylvain Defresne <sdefresne@chromium.org> | 2014-09-19 10:20:45 +0000 |
| commit | c6ccc77dc9c080d83e400dc12205bb805a25ac71 (patch) | |
| tree | 8050f444606ddb8eae0297b52676cb2e01e6f8db /ui/android/ui_android.gyp | |
| parent | 80ced42d624a1eec8e8a2f0c0c760ab576d65ead (diff) | |
| download | chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.zip chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.tar.gz chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.tar.bz2 | |
Move PageTransition from //content/public/common to //ui/base
Move PageTransition enumeration from //content/public/common to //ui/base
so that it can be used by iOS and layered components that are used on iOS.
BUG=372373
R=avi@chromium.org, ben@chromium.org, wfh@chromium.org
TBR=ben, nasko
Review URL: https://codereview.chromium.org/562603002
Cr-Commit-Position: refs/heads/master@{#295686}
Diffstat (limited to 'ui/android/ui_android.gyp')
| -rw-r--r-- | ui/android/ui_android.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ui/android/ui_android.gyp b/ui/android/ui_android.gyp index 5b8a786..bb0d0f5 100644 --- a/ui/android/ui_android.gyp +++ b/ui/android/ui_android.gyp @@ -16,6 +16,18 @@ 'includes': [ '../../build/android/java_cpp_enum.gypi' ], }, { + 'target_name': 'page_transition_types_java', + 'type': 'none', + 'sources': [ + 'java/PageTransitionTypes.template', + ], + 'variables': { + 'package_name': 'org/chromium/ui/base', + 'template_deps': ['../base/page_transition_types_list.h'], + }, + 'includes': [ '../../build/android/java_cpp_template.gypi' ], + }, + { 'target_name': 'window_open_disposition_java', 'type': 'none', 'variables': { @@ -35,6 +47,7 @@ 'dependencies': [ '../../base/base.gyp:base_java', 'bitmap_format_java', + 'page_transition_types_java', 'ui_strings_grd', 'window_open_disposition_java', ], |