Commit be1faefe authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

AW: add braces for multiline if

No change to logic. This adds braces to multiline if statements to
satisfy a presubmit check.

Bug: 999554
Test: N/A
Change-Id: I50319a0767d2a4edd68bbb4cbf1003407dd2a1f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845883
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: Tao Bai <michaelbai@chromium.org>
Auto-Submit: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarTao Bai <michaelbai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703603}
parent a32e38f2
...@@ -255,13 +255,15 @@ abstract class SharedWebViewContentsClientAdapter extends AwContentsClient { ...@@ -255,13 +255,15 @@ abstract class SharedWebViewContentsClientAdapter extends AwContentsClient {
@Override @Override
public void onRendererUnresponsive(final AwRenderProcess renderProcess) { public void onRendererUnresponsive(final AwRenderProcess renderProcess) {
if (mWebViewRendererClientAdapter != null) if (mWebViewRendererClientAdapter != null) {
mWebViewRendererClientAdapter.onRendererUnresponsive(mWebView, renderProcess); mWebViewRendererClientAdapter.onRendererUnresponsive(mWebView, renderProcess);
}
} }
@Override @Override
public void onRendererResponsive(final AwRenderProcess renderProcess) { public void onRendererResponsive(final AwRenderProcess renderProcess) {
if (mWebViewRendererClientAdapter != null) if (mWebViewRendererClientAdapter != null) {
mWebViewRendererClientAdapter.onRendererResponsive(mWebView, renderProcess); mWebViewRendererClientAdapter.onRendererResponsive(mWebView, renderProcess);
}
} }
} }
...@@ -141,8 +141,9 @@ public class AwAutofillManager { ...@@ -141,8 +141,9 @@ public class AwAutofillManager {
public void addInputUIObserver(InputUIObserver observer) { public void addInputUIObserver(InputUIObserver observer) {
if (observer == null) return; if (observer == null) return;
if (mInputUIObservers == null) if (mInputUIObservers == null) {
mInputUIObservers = new ArrayList<WeakReference<InputUIObserver>>(); mInputUIObservers = new ArrayList<WeakReference<InputUIObserver>>();
}
mInputUIObservers.add(new WeakReference<InputUIObserver>(observer)); mInputUIObservers.add(new WeakReference<InputUIObserver>(observer));
} }
......
...@@ -123,51 +123,53 @@ public class AwAutofillUMA { ...@@ -123,51 +123,53 @@ public class AwAutofillUMA {
} }
private int toUMAAutofillSessionValue() { private int toUMAAutofillSessionValue() {
if (mState == 0) if (mState == 0) {
return NO_CALLBACK_FORM_FRAMEWORK; return NO_CALLBACK_FORM_FRAMEWORK;
else if (mState == EVENT_VIRTUAL_STRUCTURE_PROVIDED) } else if (mState == EVENT_VIRTUAL_STRUCTURE_PROVIDED) {
return NO_SUGGESTION_USER_NOT_CHANGE_FORM_NO_FORM_SUBMITTED; return NO_SUGGESTION_USER_NOT_CHANGE_FORM_NO_FORM_SUBMITTED;
else if (mState == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_USER_CHANGED_FIELD_VALUE)) } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_USER_CHANGED_FIELD_VALUE)) {
return NO_SUGGESTION_USER_CHANGE_FORM_NO_FORM_SUBMITTED; return NO_SUGGESTION_USER_CHANGE_FORM_NO_FORM_SUBMITTED;
else if (mState == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_FORM_SUBMITTED)) } else if (mState == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_FORM_SUBMITTED)) {
return NO_SUGGESTION_USER_NOT_CHANGE_FORM_FORM_SUBMITTED; return NO_SUGGESTION_USER_NOT_CHANGE_FORM_FORM_SUBMITTED;
else if (mState } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_USER_CHANGED_FIELD_VALUE == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_USER_CHANGED_FIELD_VALUE
| EVENT_FORM_SUBMITTED)) | EVENT_FORM_SUBMITTED)) {
return NO_SUGGESTION_USER_CHANGE_FORM_FORM_SUBMITTED; return NO_SUGGESTION_USER_CHANGE_FORM_FORM_SUBMITTED;
else if (mState } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED
| EVENT_FORM_AUTOFILLED)) | EVENT_FORM_AUTOFILLED)) {
return USER_SELECT_SUGGESTION_USER_NOT_CHANGE_FORM_NO_FORM_SUBMITTED; return USER_SELECT_SUGGESTION_USER_NOT_CHANGE_FORM_NO_FORM_SUBMITTED;
else if (mState } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED
| EVENT_FORM_AUTOFILLED | EVENT_FORM_SUBMITTED)) | EVENT_FORM_AUTOFILLED | EVENT_FORM_SUBMITTED)) {
return USER_SELECT_SUGGESTION_USER_NOT_CHANGE_FORM_FORM_SUBMITTED; return USER_SELECT_SUGGESTION_USER_NOT_CHANGE_FORM_FORM_SUBMITTED;
else if (mState } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED
| EVENT_FORM_AUTOFILLED | EVENT_USER_CHANGED_FIELD_VALUE | EVENT_FORM_AUTOFILLED | EVENT_USER_CHANGED_FIELD_VALUE
| EVENT_FORM_SUBMITTED)) | EVENT_FORM_SUBMITTED)) {
return USER_SELECT_SUGGESTION_USER_CHANGE_FORM_FORM_SUBMITTED; return USER_SELECT_SUGGESTION_USER_CHANGE_FORM_FORM_SUBMITTED;
else if (mState } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED
| EVENT_FORM_AUTOFILLED | EVENT_USER_CHANGED_FIELD_VALUE)) | EVENT_FORM_AUTOFILLED | EVENT_USER_CHANGED_FIELD_VALUE)) {
return USER_SELECT_SUGGESTION_USER_CHANGE_FORM_NO_FORM_SUBMITTED; return USER_SELECT_SUGGESTION_USER_CHANGE_FORM_NO_FORM_SUBMITTED;
else if (mState == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED)) } else if (mState == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED)) {
return USER_NOT_SELECT_SUGGESTION_USER_NOT_CHANGE_FORM_NO_FORM_SUBMITTED; return USER_NOT_SELECT_SUGGESTION_USER_NOT_CHANGE_FORM_NO_FORM_SUBMITTED;
else if (mState } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED
| EVENT_FORM_SUBMITTED)) | EVENT_FORM_SUBMITTED)) {
return USER_NOT_SELECT_SUGGESTION_USER_NOT_CHANGE_FORM_FORM_SUBMITTED; return USER_NOT_SELECT_SUGGESTION_USER_NOT_CHANGE_FORM_FORM_SUBMITTED;
else if (mState } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED
| EVENT_USER_CHANGED_FIELD_VALUE | EVENT_FORM_SUBMITTED)) | EVENT_USER_CHANGED_FIELD_VALUE | EVENT_FORM_SUBMITTED)) {
return USER_NOT_SELECT_SUGGESTION_USER_CHANGE_FORM_FORM_SUBMITTED; return USER_NOT_SELECT_SUGGESTION_USER_CHANGE_FORM_FORM_SUBMITTED;
else if (mState } else if (mState
== (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED == (EVENT_VIRTUAL_STRUCTURE_PROVIDED | EVENT_SUGGESTION_DISPLAYED
| EVENT_USER_CHANGED_FIELD_VALUE)) | EVENT_USER_CHANGED_FIELD_VALUE)) {
return USER_NOT_SELECT_SUGGESTION_USER_CHANGE_FORM_NO_FORM_SUBMITTED; return USER_NOT_SELECT_SUGGESTION_USER_CHANGE_FORM_NO_FORM_SUBMITTED;
else } else {
return SESSION_UNKNOWN; return SESSION_UNKNOWN;
}
} }
private int mState; private int mState;
...@@ -218,10 +220,11 @@ public class AwAutofillUMA { ...@@ -218,10 +220,11 @@ public class AwAutofillUMA {
public void onUserChangeFieldValue(boolean isPreviouslyAutofilled) { public void onUserChangeFieldValue(boolean isPreviouslyAutofilled) {
if (mRecorder == null) return; if (mRecorder == null) return;
if (isPreviouslyAutofilled) if (isPreviouslyAutofilled) {
mRecorder.record(SessionRecorder.EVENT_USER_CHANGED_AUTOFILLED_FIELD); mRecorder.record(SessionRecorder.EVENT_USER_CHANGED_AUTOFILLED_FIELD);
else } else {
mRecorder.record(SessionRecorder.EVENT_USER_CHANGED_FIELD_VALUE); mRecorder.record(SessionRecorder.EVENT_USER_CHANGED_FIELD_VALUE);
}
} }
private void recordSession() { private void recordSession() {
......
...@@ -104,8 +104,9 @@ public class VariationsUtils { ...@@ -104,8 +104,9 @@ public class VariationsUtils {
} }
if (!proto.hasSignature() || !proto.hasCountry() || !proto.hasDate() if (!proto.hasSignature() || !proto.hasCountry() || !proto.hasDate()
|| !proto.hasIsGzipCompressed() || !proto.hasSeedData()) || !proto.hasIsGzipCompressed() || !proto.hasSeedData()) {
return null; return null;
}
SeedInfo info = new SeedInfo(); SeedInfo info = new SeedInfo();
info.signature = proto.getSignature(); info.signature = proto.getSignature();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment