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

Side by Side Diff: chrome/android/BUILD.gn

Issue 2277733002: Revert of Enable the optional permission prompt persistence toggle on grouped infobars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-infobardelegate-clean
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 "//chrome/test/data/google/", 411 "//chrome/test/data/google/",
412 "//chrome/test/data/image_search/valid.png", 412 "//chrome/test/data/image_search/valid.png",
413 "//chrome/test/data/navigation_interception/", 413 "//chrome/test/data/navigation_interception/",
414 "//chrome/test/data/notifications/", 414 "//chrome/test/data/notifications/",
415 "//chrome/test/data/popup_blocker/", 415 "//chrome/test/data/popup_blocker/",
416 "//chrome/test/data/push_messaging/", 416 "//chrome/test/data/push_messaging/",
417 "//chrome/test/data/translate/", 417 "//chrome/test/data/translate/",
418 "//chrome/test/data/webapps/", 418 "//chrome/test/data/webapps/",
419 "//chrome/test/media_router/resources/", 419 "//chrome/test/media_router/resources/",
420 "//content/test/data/android/geolocation.html", 420 "//content/test/data/android/geolocation.html",
421 "//content/test/data/android/media_permissions.html",
422 "//content/test/data/media/getusermedia.html", 421 "//content/test/data/media/getusermedia.html",
423 "//content/test/data/media/session/", 422 "//content/test/data/media/session/",
424 "//content/test/data/media/webrtc_test_utilities.js", 423 "//content/test/data/media/webrtc_test_utilities.js",
425 ] 424 ]
426 } 425 }
427 426
428 # Overrides icon / name defined in chrome_java_resources. 427 # Overrides icon / name defined in chrome_java_resources.
429 android_resources("chrome_public_apk_resources") { 428 android_resources("chrome_public_apk_resources") {
430 resource_dirs = [ "java/res_chromium" ] 429 resource_dirs = [ "java/res_chromium" ]
431 430
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 instrumentation_test_apk("chrome_sync_shell_test_apk") { 640 instrumentation_test_apk("chrome_sync_shell_test_apk") {
642 apk_name = "ChromeSyncShellTest" 641 apk_name = "ChromeSyncShellTest"
643 apk_under_test = ":chrome_sync_shell_apk" 642 apk_under_test = ":chrome_sync_shell_apk"
644 android_manifest = chrome_sync_shell_test_apk_manifest 643 android_manifest = chrome_sync_shell_test_apk_manifest
645 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 644 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
646 deps = [ 645 deps = [
647 ":chrome_sync_shell_test_apk_java", 646 ":chrome_sync_shell_test_apk_java",
648 ] 647 ]
649 proguard_enabled = !is_java_debug 648 proguard_enabled = !is_java_debug
650 } 649 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698