Replaced the current WebsiteSettings dialog with a new PageInfo dialog

android_webview/java_library_common.mk

 # Copyright 2014 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.
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
 
 # contentview and its dependencies
 LOCAL_AIDL_INCLUDES := \
     $(LOCAL_PATH)/../content/public/android/java/src \
     $(LOCAL_PATH)/../net/android/java/src \
@@ skipping 20 matching lines @@
         ../components/navigation_interception/android/java/src) \
 
 # This directory includes .java files that are generated by the normal gyp build, but are checked in
 # for the Android build.
 # TODO(torne, cjhopman): Consider removing this.
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, java/generated_src)
 
 # Java files generated from .template rules. This list should match list of java dependencies in
 # android_webview/android_webview.gyp
+# TODO(sashab, mkosiba): Is the list of Java dependencies really in android_webview.gyp and not
+# libwebviewchromium.gypi?
 LOCAL_GENERATED_SOURCES := \
 $(call intermediates-dir-for,GYP,shared)/enums/bitmap_format_java/org/chromium/ui/gfx/BitmapFormat.java \
 $(call intermediates-dir-for,GYP,shared)/enums/cert_verify_status_android_java/org/chromium/net/CertVerifyStatusAndroid.java \
 $(call intermediates-dir-for,GYP,shared)/enums/certificate_mime_types_java/org/chromium/net/CertificateMimeType.java \
+$(call intermediates-dir-for,GYP,shared)/enums/page_info_connection_type/org/chromium/chrome/browser/PageInfoConnectionType.java \

[benm (inactive), 2014/10/06 09:04:07]

Hold up, sorry I didn't notice this before. WebView cannot depend on anything in
the chrome/ layer. It needs to move to content/, or a component.

It looks like all the other changes in this CL are in chrome/, so I'm not sure
why we need this diff at all here?

[sashab, 2014/10/06 23:11:54]

No, Android Webview doesn't need PageInfoConnectionType anyway. Removed the
changes to both this and libwebviewchromium.gypi.

 $(call intermediates-dir-for,GYP,shared)/enums/private_key_types_java/org/chromium/net/PrivateKeyType.java \
 $(call intermediates-dir-for,GYP,shared)/enums/window_open_disposition_java/org/chromium/ui/WindowOpenDisposition.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/ApplicationState.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPressureLevelList.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/GestureEventType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/SpeechRecognitionError.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/CanonicalAxisIndex.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/CanonicalButtonIndex.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/PopupItemType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/SelectionEventType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/common/ScreenOrientationValues.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/AndroidImageFormat.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/base/PageTransitionTypes.java \
 
 # content dependencies on java components that are provided by the system on
 # android
 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava