diff options
14 files changed, 31 insertions, 36 deletions
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 4759eb9..10bc9ff 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -180,6 +180,7 @@ android_library("chrome_java") { # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java # GYP: //chrome/chrome_browser.gypi:connection_security_security_levels_java # GYP: //chrome/chrome_browser.gypi:tab_load_status_java +# GYP: //chrome/chrome_browser.gypi:infobar_action_type_java java_cpp_enum("chrome_android_java_enums_srcjar") { sources = [ "//chrome/browser/android/activity_type_ids.h", @@ -188,6 +189,7 @@ java_cpp_enum("chrome_android_java_enums_srcjar") { "//chrome/browser/android/tab_android.h", "//chrome/browser/profiles/profile_metrics.h", "//chrome/browser/ssl/connection_security.h", + "//chrome/browser/ui/android/infobars/infobar_android.h", ] outputs = [ "org/chromium/chrome/browser/ActivityTypeIds.java", @@ -196,6 +198,7 @@ java_cpp_enum("chrome_android_java_enums_srcjar") { "org/chromium/chrome/browser/TabLoadStatus.java", "org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java", "org/chromium/chrome/browser/ssl/ConnectionSecurityLevel.java", + "org/chromium/chrome/browser/infobar/ActionType.java", ] } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java index 2931dea..b4cc31f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java @@ -202,7 +202,7 @@ public class ConfirmInfoBar extends InfoBar { mConfirmListener.onConfirmInfoBarButtonClicked(this, isPrimaryButton); } - int action = isPrimaryButton ? InfoBar.ACTION_TYPE_OK : InfoBar.ACTION_TYPE_CANCEL; + int action = isPrimaryButton ? ActionType.OK : ActionType.CANCEL; onButtonClicked(action, ""); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java index 2514602..8f4f3b3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java @@ -52,8 +52,8 @@ public class DownloadOverwriteInfoBar extends InfoBar { @Override public void onButtonClicked(boolean isPrimaryButton) { - int action = isPrimaryButton ? InfoBar.ACTION_TYPE_OVERWRITE - : InfoBar.ACTION_TYPE_CREATE_NEW_FILE; + int action = isPrimaryButton ? ActionType.OVERWRITE + : ActionType.CREATE_NEW_FILE; onButtonClicked(action, ""); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBar.java index cba284c..0918304 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBar.java @@ -60,6 +60,6 @@ public class GeneratedPasswordSavedInfoBar extends InfoBar { */ @Override public void onButtonClicked(boolean isPrimaryButton) { - onButtonClicked(InfoBar.ACTION_TYPE_OK, ""); + onButtonClicked(ActionType.OK, ""); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java index 1e96d2d..72eaaa8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java @@ -20,26 +20,6 @@ import org.chromium.chrome.R; public abstract class InfoBar implements InfoBarView { private static final String TAG = "InfoBar"; - /** - * Possible labels of all the infobar buttons. - * - * Make sure this set of values is aligned with the C++ correspondent in - * infobar_android.h - */ - public static final int ACTION_TYPE_NONE = 0; - - // Confirm infobar - public static final int ACTION_TYPE_OK = 1; - public static final int ACTION_TYPE_CANCEL = 2; - - // Translate infobar - public static final int ACTION_TYPE_TRANSLATE = 3; - public static final int ACTION_TYPE_TRANSLATE_SHOW_ORIGINAL = 4; - - // Download Overwrite InfoBar - public static final int ACTION_TYPE_OVERWRITE = 5; - public static final int ACTION_TYPE_CREATE_NEW_FILE = 6; - private final int mIconDrawableId; private final Bitmap mIconBitmap; private final CharSequence mMessage; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateAlwaysPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateAlwaysPanel.java index a3de964..e902387 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateAlwaysPanel.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateAlwaysPanel.java @@ -37,9 +37,9 @@ public class TranslateAlwaysPanel implements TranslateSubPanel { @Override public void onButtonClicked(boolean primary) { if (primary) { - mListener.onPanelClosed(InfoBar.ACTION_TYPE_NONE); + mListener.onPanelClosed(ActionType.NONE); } else { - mListener.onPanelClosed(InfoBar.ACTION_TYPE_TRANSLATE_SHOW_ORIGINAL); + mListener.onPanelClosed(ActionType.TRANSLATE_SHOW_ORIGINAL); } } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateCheckBox.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateCheckBox.java index 0e8fc8d..24c8c7a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateCheckBox.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateCheckBox.java @@ -35,6 +35,6 @@ public class TranslateCheckBox extends AppCompatCheckBox implements OnCheckedCha @Override public void onCheckedChanged(CompoundButton view, boolean isChecked) { mOptions.toggleAlwaysTranslateLanguageState(isChecked); - mListener.onPanelClosed(InfoBar.ACTION_TYPE_NONE); + mListener.onPanelClosed(ActionType.NONE); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java index cc44b86..50418f1 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java @@ -81,7 +81,7 @@ public class TranslateInfoBar extends InfoBar implements SubPanelListener { int action = actionFor(isPrimaryButton); if (getInfoBarType() == BEFORE_TRANSLATE_INFOBAR && mOptionsPanelViewType == NO_PANEL - && action == ACTION_TYPE_CANCEL && needsNeverPanel()) { + && action == ActionType.CANCEL && needsNeverPanel()) { // "Nope" was clicked and instead of dismissing we need to show // the extra never panel. swapPanel(NEVER_PANEL); @@ -94,21 +94,21 @@ public class TranslateInfoBar extends InfoBar implements SubPanelListener { * Based on the infobar and the button pressed figure out what action needs to happen. */ private int actionFor(boolean isPrimaryButton) { - int action = InfoBar.ACTION_TYPE_NONE; + int action = ActionType.NONE; int infobarType = getInfoBarType(); switch (infobarType) { case TranslateInfoBar.BEFORE_TRANSLATE_INFOBAR: action = isPrimaryButton - ? InfoBar.ACTION_TYPE_TRANSLATE : InfoBar.ACTION_TYPE_CANCEL; + ? ActionType.TRANSLATE : ActionType.CANCEL; break; case TranslateInfoBar.AFTER_TRANSLATE_INFOBAR: if (!isPrimaryButton) { - action = InfoBar.ACTION_TYPE_TRANSLATE_SHOW_ORIGINAL; + action = ActionType.TRANSLATE_SHOW_ORIGINAL; } break; case TranslateInfoBar.TRANSLATE_ERROR_INFOBAR: // retry - action = InfoBar.ACTION_TYPE_TRANSLATE; + action = ActionType.TRANSLATE; break; default: break; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateLanguagePanel.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateLanguagePanel.java index 33b66a9..7363f3c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateLanguagePanel.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateLanguagePanel.java @@ -88,7 +88,7 @@ public class TranslateLanguagePanel mOptions.setSourceLanguage(mSessionOptions.sourceLanguageIndex()); mOptions.setTargetLanguage(mSessionOptions.targetLanguageIndex()); } - mListener.onPanelClosed(InfoBar.ACTION_TYPE_NONE); + mListener.onPanelClosed(ActionType.NONE); } private void createSpinners(Context context) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateNeverPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateNeverPanel.java index 81a5fe8..53d5435 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateNeverPanel.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateNeverPanel.java @@ -39,6 +39,6 @@ public class TranslateNeverPanel implements TranslateSubPanel { } else { mOptions.toggleNeverTranslateLanguageState(true); } - mListener.onPanelClosed(InfoBar.ACTION_TYPE_NONE); + mListener.onPanelClosed(ActionType.NONE); } } diff --git a/chrome/browser/ui/android/infobars/infobar_android.h b/chrome/browser/ui/android/infobars/infobar_android.h index ea36813..bf2f9cc 100644 --- a/chrome/browser/ui/android/infobars/infobar_android.h +++ b/chrome/browser/ui/android/infobars/infobar_android.h @@ -22,8 +22,9 @@ class InfoBarDelegate; class InfoBarAndroid : public infobars::InfoBar { public: - // Make sure this set of values is aligned with the java constants defined in - // InfoBar.java! + // A Java counterpart will be generated for this enum. + // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.infobar + // GENERATED_JAVA_PREFIX_TO_STRIP: ACTION_ enum ActionType { ACTION_NONE = 0, // Confirm infobar diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index fcb94b2..88c9793 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -577,6 +577,7 @@ 'connection_security_security_levels_java', 'connectivity_check_result_java', 'document_tab_model_info_proto_java', + 'infobar_action_type_java', 'profile_account_management_metrics_java', 'content_setting_java', 'content_settings_type_java', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 961061b..0548495 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4029,6 +4029,15 @@ }, { # GN: //chrome/android:chrome_android_java_enums_srcjar + 'target_name': 'infobar_action_type_java', + 'type': 'none', + 'variables': { + 'source_file': 'browser/ui/android/infobars/infobar_android.h', + }, + 'includes': [ '../build/android/java_cpp_enum.gypi' ], + }, + { + # GN: //chrome/android:chrome_android_java_enums_srcjar 'target_name': 'shortcut_source_java', 'type': 'none', 'variables': { diff --git a/tools/android/eclipse/.classpath b/tools/android/eclipse/.classpath index 00baa42..e8831b6 100644 --- a/tools/android/eclipse/.classpath +++ b/tools/android/eclipse/.classpath @@ -115,6 +115,7 @@ to the classpath for downstream development. See "additional_entries" below. <classpathentry kind="src" path="out/Debug/gen/enums/cronet_url_request_java"/> <classpathentry kind="src" path="out/Debug/gen/enums/enhanced_bookmarks_java_enums_srcjar"/> <classpathentry kind="src" path="out/Debug/gen/enums/gesture_event_type_java"/> + <classpathentry kind="src" path="out/Debug/gen/enums/infobar_action_type_java"/> <classpathentry kind="src" path="out/Debug/gen/enums/invalidate_types_java"/> <classpathentry kind="src" path="out/Debug/gen/enums/media_android_captureapitype"/> <classpathentry kind="src" path="out/Debug/gen/enums/media_android_imageformat"/> |