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

Side by Side Diff: chrome/BUILD.gn

Issue 2415863002: Use PermissionType instead of ContentSettingsType in Android permission infobars (Closed)
Patch Set: Merge branch 'master' into use_permission_type_for_infobar Created 4 years, 2 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 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/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/locales.gni") 9 import("//build/config/locales.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1418 "../components/content_settings/core/common/content_settings.h", 1418 "../components/content_settings/core/common/content_settings.h",
1419 ] 1419 ]
1420 } 1420 }
1421 1421
1422 java_cpp_enum("content_settings_type_javagen") { 1422 java_cpp_enum("content_settings_type_javagen") {
1423 sources = [ 1423 sources = [
1424 "../components/content_settings/core/common/content_settings_types.h", 1424 "../components/content_settings/core/common/content_settings_types.h",
1425 ] 1425 ]
1426 } 1426 }
1427 1427
1428 java_cpp_enum("permission_type_javagen") {
1429 sources = [
1430 "../content/public/browser/permission_type.h",
1431 ]
1432 }
1433
1428 java_cpp_enum("signin_metrics_enum_javagen") { 1434 java_cpp_enum("signin_metrics_enum_javagen") {
1429 sources = [ 1435 sources = [
1430 "../components/signin/core/browser/signin_metrics.h", 1436 "../components/signin/core/browser/signin_metrics.h",
1431 ] 1437 ]
1432 } 1438 }
1433 1439
1434 java_cpp_enum("page_info_connection_type_javagen") { 1440 java_cpp_enum("page_info_connection_type_javagen") {
1435 sources = [ 1441 sources = [
1436 "browser/ui/android/page_info/website_settings_popup_android.h", 1442 "browser/ui/android/page_info/website_settings_popup_android.h",
1437 ] 1443 ]
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1562 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1568 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1563 "//chrome/tools/build/linux/chrome-wrapper", 1569 "//chrome/tools/build/linux/chrome-wrapper",
1564 "//third_party/xdg-utils/scripts/xdg-mime", 1570 "//third_party/xdg-utils/scripts/xdg-mime",
1565 "//third_party/xdg-utils/scripts/xdg-settings", 1571 "//third_party/xdg-utils/scripts/xdg-settings",
1566 ] 1572 ]
1567 outputs = [ 1573 outputs = [
1568 "$root_out_dir/{{source_file_part}}", 1574 "$root_out_dir/{{source_file_part}}",
1569 ] 1575 ]
1570 } 1576 }
1571 } 1577 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698