Replaced the current WebsiteSettings dialog with a new PageInfo dialog

ui/android/ui_android.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 10 matching lines @@
       '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': 'page_info_connection_type_java',

[cjhopman, 2014/09/25 21:17:52]

This (and the dependency below) will have to be added to GN.

It looks like ui is using a single target for all java_cpp_enum and so you will
just need to add the sources + outputs in it. See ui/android/BUILD.gn and find
the java_enums_srcjar target.

[sashab, 2014/09/29 04:17:12]

This is actually a duplicate definition of the target as a result of a merge
conflict; this is not used, so I've removed it.

+      'type': 'none',
+      'variables': {
+        'source_file': '../../chrome/browser/ui/android/website_settings_popup_android.h',
+      },
+      'includes': [ '../../build/android/java_cpp_enum.gypi' ],
+    },
+    {
       'target_name': 'window_open_disposition_java',
       'type': 'none',
       'variables': {
         'source_file': '../base/window_open_disposition.h',
       },
       'includes': [ '../../build/android/java_cpp_enum.gypi' ],
     },
     {
       'target_name': 'ui_java',
       'type': 'none',
       'variables': {
         'java_in_dir': '../../ui/android/java',
         'has_java_resources': 1,
         'R_package': 'org.chromium.ui',
         'R_package_relpath': 'org/chromium/ui',
       },
       'dependencies': [
         '../../base/base.gyp:base_java',
         'bitmap_format_java',
+        'page_info_connection_type_java',
         'page_transition_types_java',
         'ui_strings_grd',
         'window_open_disposition_java',
       ],
       'includes': [ '../../build/java.gypi' ],
     },
     {
       'target_name': 'ui_strings_grd',
        # The android_webview/Android.mk file depends on this target directly.
       'android_unmangled_name': 1,
       'type': 'none',
       'variables': {
         'grd_file': '../../ui/android/java/strings/android_ui_strings.grd',
       },
       'includes': [
         '../../build/java_strings_grd.gypi',
       ],
     },
   ],
 }