Commit 4eff04aa authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

AW: add @Override to fix compile warnings in glue layer

No change in logic.

This adds @Override annotations to fix compile warnings in WebView's
glue layer.

Bug: 779716
Test: ninja system_webview_google_apk (rebuild glue, look for compile warnings)
Change-Id: I73096eaec795a9956993ed34f7d1508c0d19e01f
Reviewed-on: https://chromium-review.googlesource.com/744962Reviewed-by: default avatarTao Bai <michaelbai@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513050}
parent e9238cca
...@@ -611,10 +611,12 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings { ...@@ -611,10 +611,12 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
return mAwSettings.getOffscreenPreRaster(); return mAwSettings.getOffscreenPreRaster();
} }
@Override
public void setDisabledActionModeMenuItems(int menuItems) { public void setDisabledActionModeMenuItems(int menuItems) {
mAwSettings.setDisabledActionModeMenuItems(menuItems); mAwSettings.setDisabledActionModeMenuItems(menuItems);
} }
@Override
public int getDisabledActionModeMenuItems() { public int getDisabledActionModeMenuItems() {
return mAwSettings.getDisabledActionModeMenuItems(); return mAwSettings.getDisabledActionModeMenuItems();
} }
......
...@@ -82,8 +82,7 @@ public class ServiceWorkerClientAdapter extends AwServiceWorkerClient { ...@@ -82,8 +82,7 @@ public class ServiceWorkerClientAdapter extends AwServiceWorkerClient {
return mRequest.requestHeaders; return mRequest.requestHeaders;
} }
// TODO(mnaganov): Uncomment when we completely switch builds to the next API level. @Override
//@Override
public boolean isRedirect() { public boolean isRedirect() {
return mRequest.isRedirect; return mRequest.isRedirect;
} }
......
...@@ -25,18 +25,22 @@ public class WebMessagePortAdapter extends WebMessagePort { ...@@ -25,18 +25,22 @@ public class WebMessagePortAdapter extends WebMessagePort {
mPort = port; mPort = port;
} }
@Override
public void postMessage(WebMessage message) { public void postMessage(WebMessage message) {
mPort.postMessage(message.getData(), toMessagePorts(message.getPorts())); mPort.postMessage(message.getData(), toMessagePorts(message.getPorts()));
} }
@Override
public void close() { public void close() {
mPort.close(); mPort.close();
} }
@Override
public void setWebMessageCallback(WebMessageCallback callback) { public void setWebMessageCallback(WebMessageCallback callback) {
setWebMessageCallback(callback, null); setWebMessageCallback(callback, null);
} }
@Override
public void setWebMessageCallback(final WebMessageCallback callback, final Handler handler) { public void setWebMessageCallback(final WebMessageCallback callback, final Handler handler) {
mPort.setMessageCallback(new MessagePort.MessageCallback() { mPort.setMessageCallback(new MessagePort.MessageCallback() {
@Override @Override
......
...@@ -1541,6 +1541,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate ...@@ -1541,6 +1541,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
return (TextClassifier) mAwContents.getTextClassifier(); return (TextClassifier) mAwContents.getTextClassifier();
} }
@Override
public void autofill(final SparseArray<AutofillValue> values) { public void autofill(final SparseArray<AutofillValue> values) {
mFactory.startYourEngines(false); mFactory.startYourEngines(false);
if (checkNeedsPost()) { if (checkNeedsPost()) {
...@@ -2128,26 +2129,31 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate ...@@ -2128,26 +2129,31 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
// Overrides method added to WebViewProvider.ViewDelegate interface // Overrides method added to WebViewProvider.ViewDelegate interface
// (not called in M and below) // (not called in M and below)
@Override
public Handler getHandler(Handler originalHandler) { public Handler getHandler(Handler originalHandler) {
return originalHandler; return originalHandler;
} }
// Overrides method added to WebViewProvider.ViewDelegate interface // Overrides method added to WebViewProvider.ViewDelegate interface
// (not called in M and below) // (not called in M and below)
@Override
public View findFocus(View originalFocusedView) { public View findFocus(View originalFocusedView) {
return originalFocusedView; return originalFocusedView;
} }
// Remove from superclass // Remove from superclass
@Override
public void preDispatchDraw(Canvas canvas) { public void preDispatchDraw(Canvas canvas) {
// TODO(leandrogracia): remove this method from WebViewProvider if we think // TODO(leandrogracia): remove this method from WebViewProvider if we think
// we won't need it again. // we won't need it again.
} }
@Override
public void onStartTemporaryDetach() { public void onStartTemporaryDetach() {
mAwContents.onStartTemporaryDetach(); mAwContents.onStartTemporaryDetach();
} }
@Override
public void onFinishTemporaryDetach() { public void onFinishTemporaryDetach() {
mAwContents.onFinishTemporaryDetach(); mAwContents.onFinishTemporaryDetach();
} }
......
...@@ -687,6 +687,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { ...@@ -687,6 +687,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
return (ServiceWorkerController) mServiceWorkerController; return (ServiceWorkerController) mServiceWorkerController;
} }
@Override
public TokenBindingService getTokenBindingService() { public TokenBindingService getTokenBindingService() {
synchronized (mLock) { synchronized (mLock) {
if (mTokenBindingManager == null) { if (mTokenBindingManager == null) {
......
...@@ -295,8 +295,7 @@ class WebViewContentsClientAdapter extends AwContentsClient { ...@@ -295,8 +295,7 @@ class WebViewContentsClientAdapter extends AwContentsClient {
return mRequest.requestHeaders; return mRequest.requestHeaders;
} }
// TODO(mnaganov): Uncomment when we completely switch builds to the next API level. @Override
//@Override
public boolean isRedirect() { public boolean isRedirect() {
return mRequest.isRedirect; return mRequest.isRedirect;
} }
...@@ -310,10 +309,12 @@ class WebViewContentsClientAdapter extends AwContentsClient { ...@@ -310,10 +309,12 @@ class WebViewContentsClientAdapter extends AwContentsClient {
mError = error; mError = error;
} }
@Override
public int getErrorCode() { public int getErrorCode() {
return mError.errorCode; return mError.errorCode;
} }
@Override
public CharSequence getDescription() { public CharSequence getDescription() {
return mError.description; return mError.description;
} }
......
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