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

Side by Side Diff: chrome/BUILD.gn

Issue 620983002: Add Permissions to the PageInfo dialog on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page_info_dialog_shell_only_v2
Patch Set: Final rebase Created 6 years, 1 month 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/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/locales.gni") 6 import("//build/config/locales.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//chrome/chrome_repack_locales.gni") 8 import("//chrome/chrome_repack_locales.gni")
9 import("//chrome/version.gni") 9 import("//chrome/version.gni")
10 10
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 deps = [ 522 deps = [
523 "//chrome/app:chromium_strings", 523 "//chrome/app:chromium_strings",
524 "//chrome/app:generated_resources", 524 "//chrome/app:generated_resources",
525 "//chrome/app:google_chrome_strings", 525 "//chrome/app:google_chrome_strings",
526 "//chrome/app/resources:locale_settings", 526 "//chrome/app/resources:locale_settings",
527 ] 527 ]
528 } 528 }
529 529
530 if (is_android) { 530 if (is_android) {
531 531
532 # GYP: //chrome/chrome.gyp:content_setting_java
533 java_cpp_enum("content_setting_javagen") {
534 sources = [
535 "../components/content_settings/core/common/content_settings.h"
536 ]
537 outputs = [
538 "org/chromium/chrome/browser/ContentSetting.java",
539 ]
540 }
541
542 # GYP: //chrome/chrome.gyp:content_settings_type_java
543 java_cpp_enum("content_settings_type_javagen") {
544 sources = [
545 "../components/content_settings/core/common/content_settings_types.h"
546 ]
547 outputs = [
548 "org/chromium/chrome/browser/ContentSettingsType.java",
549 ]
550 }
551
532 # GYP: //chrome/chrome.gyp:page_info_connection_type_java 552 # GYP: //chrome/chrome.gyp:page_info_connection_type_java
533 java_cpp_enum("page_info_connection_type_javagen") { 553 java_cpp_enum("page_info_connection_type_javagen") {
534 sources = [ 554 sources = [
535 "browser/ui/android/website_settings_popup_android.h" 555 "browser/ui/android/website_settings_popup_android.h"
536 ] 556 ]
537 outputs = [ 557 outputs = [
538 "org/chromium/chrome/browser/PageInfoConnectionType.java", 558 "org/chromium/chrome/browser/PageInfoConnectionType.java",
539 ] 559 ]
540 } 560 }
541 561
(...skipping 22 matching lines...) Expand all
564 "//chrome/browser/ui", 584 "//chrome/browser/ui",
565 "//chrome/plugin", 585 "//chrome/plugin",
566 "//chrome/renderer", 586 "//chrome/renderer",
567 "//chrome/utility", 587 "//chrome/utility",
568 "//components/enhanced_bookmarks", 588 "//components/enhanced_bookmarks",
569 "//content/public/app:browser", 589 "//content/public/app:browser",
570 ] 590 ]
571 } 591 }
572 592
573 } 593 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/BUILD.gn » ('j') | chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698