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

Side by Side Diff: content/content.gyp

Issue 14139013: Hide location bar on Javascript-initiated scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge ShowTopControls into UpdateTopControlsState, use new TopControlsState enum in plumbing, gener… Created 7 years, 7 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
OLDNEW
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [ 9 'conditions': [
10 ['inside_chromium_build==0', { 10 ['inside_chromium_build==0', {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 'type': 'none', 320 'type': 'none',
321 'dependencies': [ 321 'dependencies': [
322 '../base/base.gyp:base', 322 '../base/base.gyp:base',
323 '../media/media.gyp:media_java', 323 '../media/media.gyp:media_java',
324 '../net/net.gyp:net', 324 '../net/net.gyp:net',
325 '../ui/ui.gyp:ui_java', 325 '../ui/ui.gyp:ui_java',
326 'common_aidl', 326 'common_aidl',
327 'content_common', 327 'content_common',
328 'page_transition_types_java', 328 'page_transition_types_java',
329 'result_codes_java', 329 'result_codes_java',
330 'top_controls_state_java',
330 'content_native_libraries_gen', 331 'content_native_libraries_gen',
331 ], 332 ],
332 'variables': { 333 'variables': {
333 'java_in_dir': '../content/public/android/java', 334 'java_in_dir': '../content/public/android/java',
334 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 335 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
335 'has_java_resources': 1, 336 'has_java_resources': 1,
336 'R_package': 'org.chromium.content', 337 'R_package': 'org.chromium.content',
337 'R_package_relpath': 'org/chromium/content', 338 'R_package_relpath': 'org/chromium/content',
338 'java_strings_grd': 'android_content_strings.grd', 339 'java_strings_grd': 'android_content_strings.grd',
339 }, 340 },
(...skipping 25 matching lines...) Expand all
365 'sources': [ 366 'sources': [
366 'public/android/java/src/org/chromium/content/common/ResultCodes.tem plate', 367 'public/android/java/src/org/chromium/content/common/ResultCodes.tem plate',
367 ], 368 ],
368 'variables': { 369 'variables': {
369 'package_name': 'org/chromium/content/common', 370 'package_name': 'org/chromium/content/common',
370 'template_deps': ['public/common/result_codes_list.h'], 371 'template_deps': ['public/common/result_codes_list.h'],
371 }, 372 },
372 'includes': [ '../build/android/java_cpp_template.gypi' ], 373 'includes': [ '../build/android/java_cpp_template.gypi' ],
373 }, 374 },
374 { 375 {
376 'target_name': 'top_controls_state_java',
377 'type': 'none',
378 'sources': [
379 'public/android/java/src/org/chromium/content/browser/TopControlsSta te.template',
380 ],
381 'variables': {
382 'package_name': 'org/chromium/content/browser',
383 'template_deps': ['../cc/input/top_controls_state_list.h'],
384 },
385 'includes': [ '../build/android/java_cpp_template.gypi' ],
386 },
387 {
375 'target_name': 'java_set_jni_headers', 388 'target_name': 'java_set_jni_headers',
376 'type': 'none', 389 'type': 'none',
377 'variables': { 390 'variables': {
378 'jni_gen_package': 'content', 391 'jni_gen_package': 'content',
379 'input_java_class': 'java/util/HashSet.class', 392 'input_java_class': 'java/util/HashSet.class',
380 }, 393 },
381 'includes': [ '../build/jar_file_jni_generator.gypi' ], 394 'includes': [ '../build/jar_file_jni_generator.gypi' ],
382 }, 395 },
383 396
384 { 397 {
385 'target_name': 'content_jni_headers', 398 'target_name': 'content_jni_headers',
386 'type': 'none', 399 'type': 'none',
387 'dependencies': [ 400 'dependencies': [
388 'java_set_jni_headers', 401 'java_set_jni_headers',
389 ], 402 ],
390 'direct_dependent_settings': { 403 'direct_dependent_settings': {
391 'include_dirs': [ 404 'include_dirs': [
392 '<(SHARED_INTERMEDIATE_DIR)/content', 405 '<(SHARED_INTERMEDIATE_DIR)/content',
393 ], 406 ],
394 }, 407 },
395 'includes': [ 'content_jni.gypi' ], 408 'includes': [ 'content_jni.gypi' ],
396 }, 409 },
397 ], 410 ],
398 }], # OS == "android" 411 }], # OS == "android"
399 ], 412 ],
400 } 413 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698