diff options
| -rw-r--r-- | android_webview/lib/DEPS | 3 | ||||
| -rw-r--r-- | android_webview/lib/main/webview_stubs.cc | 6 | ||||
| -rw-r--r-- | chrome/android/testshell/testshell_stubs.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/android/tab_android_test_stubs.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/ui/android/infobar_stubs.cc | 6 |
5 files changed, 23 insertions, 6 deletions
diff --git a/android_webview/lib/DEPS b/android_webview/lib/DEPS index dd4efb7..31fdc7c 100644 --- a/android_webview/lib/DEPS +++ b/android_webview/lib/DEPS @@ -17,6 +17,9 @@ include_rules = [ # Temporary until TabAndroid is in a more suitable place. "!chrome/browser/android/tab_android.h", + # Temporary until chrome dependencies are removed. + "!chrome/browser/api/infobars/confirm_infobar_delegate.h", + # Temporary until autofill becomes a browser component. "!chrome/browser/autofill/autofill_external_delegate.h", diff --git a/android_webview/lib/main/webview_stubs.cc b/android_webview/lib/main/webview_stubs.cc index abdd156..4a8f894 100644 --- a/android_webview/lib/main/webview_stubs.cc +++ b/android_webview/lib/main/webview_stubs.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/android/tab_android.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/autofill/autofill_external_delegate.h" // This file contains temporary stubs to allow the libwebview target to compile. @@ -25,3 +26,8 @@ AutofillExternalDelegate* AutofillExternalDelegate::Create( // Chrome). return NULL; } + +// static +InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) { + return NULL; +} diff --git a/chrome/android/testshell/testshell_stubs.cc b/chrome/android/testshell/testshell_stubs.cc index 717df43..948a71f 100644 --- a/chrome/android/testshell/testshell_stubs.cc +++ b/chrome/android/testshell/testshell_stubs.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/logging.h" #include "chrome/browser/android/tab_android.h" #include "chrome/browser/autofill/autofill_external_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" // This file contains temporary stubs to allow the libtestshell target to // compile. They will be removed once real implementations are @@ -21,3 +23,8 @@ AutofillExternalDelegate* AutofillExternalDelegate::Create( AutofillManager* manager) { return NULL; } + +InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) { + NOTIMPLEMENTED(); + return NULL; +} diff --git a/chrome/browser/android/tab_android_test_stubs.cc b/chrome/browser/android/tab_android_test_stubs.cc index edfd4cd..238eb5c 100644 --- a/chrome/browser/android/tab_android_test_stubs.cc +++ b/chrome/browser/android/tab_android_test_stubs.cc @@ -6,6 +6,7 @@ // needed to compile some tests. #include "chrome/browser/android/tab_android.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" // static TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) { @@ -16,3 +17,9 @@ TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) { TabAndroid* TabAndroid::GetNativeTab(JNIEnv* env, jobject obj) { return NULL; } + +// This is here temporaily till we add support for infobars upstream. +// static +InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) { + return NULL; +} diff --git a/chrome/browser/ui/android/infobar_stubs.cc b/chrome/browser/ui/android/infobar_stubs.cc index d6e6c25..f8048ba 100644 --- a/chrome/browser/ui/android/infobar_stubs.cc +++ b/chrome/browser/ui/android/infobar_stubs.cc @@ -7,12 +7,6 @@ #include "chrome/browser/extensions/extension_infobar_delegate.h" // Infobars are implemented in Java on Android. - -InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) { - NOTIMPLEMENTED(); - return NULL; -} - InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarService* owner) { NOTIMPLEMENTED(); return NULL; |