diff options
| author | dominickn <dominickn@google.com> | 2015-05-29 03:25:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 10:26:28 +0000 |
| commit | 583a6c2a684d55ab7d2fc7f758e3af1bb4adf244 (patch) | |
| tree | 0075b9ee70a585c9cbfeb636ff5bbb3f220cb124 | |
| parent | 296900634b5d646d19dbd5415183788a6f005633 (diff) | |
| download | chromium_src-583a6c2a684d55ab7d2fc7f758e3af1bb4adf244.zip chromium_src-583a6c2a684d55ab7d2fc7f758e3af1bb4adf244.tar.gz chromium_src-583a6c2a684d55ab7d2fc7f758e3af1bb4adf244.tar.bz2 | |
Add 'Android' suffix to mobile app banner implementation.
The existing app banner info bars are Android only, but the classes do not have Android
suffixes in the banner namespace. This complicates the naming of
desktop-specific app banner infobars.
This CL renames the existing app
banner info bar classes and their corresponding Java classes as a precursor for the desktop implementation.
BUG=491001
Review URL: https://codereview.chromium.org/1149873007
Cr-Commit-Position: refs/heads/master@{#331938}
11 files changed, 113 insertions, 111 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java index 970a51c..f566636 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java @@ -24,7 +24,7 @@ import org.chromium.chrome.browser.banners.AppData; /** * Infobar informing the user about an app related to this page. */ -public class AppBannerInfoBar extends ConfirmInfoBar implements View.OnClickListener { +public class AppBannerInfoBarAndroid extends ConfirmInfoBar implements View.OnClickListener { // Installation states. public static final int INSTALL_STATE_NOT_INSTALLED = 0; public static final int INSTALL_STATE_INSTALLING = 1; @@ -45,7 +45,8 @@ public class AppBannerInfoBar extends ConfirmInfoBar implements View.OnClickList private final String mAppUrl; // Banner for native apps. - private AppBannerInfoBar(long nativeInfoBar, String appTitle, Bitmap iconBitmap, AppData data) { + private AppBannerInfoBarAndroid( + long nativeInfoBar, String appTitle, Bitmap iconBitmap, AppData data) { super(nativeInfoBar, null, 0, iconBitmap, appTitle, null, data.installButtonText(), null); mAppTitle = appTitle; mAppData = data; @@ -54,7 +55,8 @@ public class AppBannerInfoBar extends ConfirmInfoBar implements View.OnClickList } // Banner for web apps. - private AppBannerInfoBar(long nativeInfoBar, String appTitle, Bitmap iconBitmap, String url) { + private AppBannerInfoBarAndroid( + long nativeInfoBar, String appTitle, Bitmap iconBitmap, String url) { super(nativeInfoBar, null, 0, iconBitmap, appTitle, null, getAddToHomescreenText(), null); mAppTitle = appTitle; mAppData = null; @@ -169,12 +171,12 @@ public class AppBannerInfoBar extends ConfirmInfoBar implements View.OnClickList @CalledByNative private static InfoBar createNativeAppInfoBar( long nativeInfoBar, String appTitle, Bitmap iconBitmap, AppData appData) { - return new AppBannerInfoBar(nativeInfoBar, appTitle, iconBitmap, appData); + return new AppBannerInfoBarAndroid(nativeInfoBar, appTitle, iconBitmap, appData); } @CalledByNative private static InfoBar createWebAppInfoBar( long nativeInfoBar, String appTitle, Bitmap iconBitmap, String url) { - return new AppBannerInfoBar(nativeInfoBar, appTitle, iconBitmap, url); + return new AppBannerInfoBarAndroid(nativeInfoBar, appTitle, iconBitmap, url); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java index 686fe8f..99343c9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java @@ -22,14 +22,14 @@ import org.chromium.ui.base.WindowAndroid; /** * Handles the promotion and installation of an app specified by the current web page. This Java - * object is created by and owned by the native AppBannerInfoBarDelegate. + * object is created by and owned by the native AppBannerInfoBarDelegateAndroid. */ @JNINamespace("banners") -public class AppBannerInfoBarDelegate { +public class AppBannerInfoBarDelegateAndroid { /** PackageManager to use in place of the real one. */ private static PackageManager sPackageManagerForTests; - /** Weak pointer to the native AppBannerInfoBarDelegate. */ + /** Weak pointer to the native AppBannerInfoBarDelegateAndroid. */ private long mNativePointer; /** Monitors an installation in progress. */ @@ -44,7 +44,7 @@ public class AppBannerInfoBarDelegate { sPackageManagerForTests = manager; } - private AppBannerInfoBarDelegate(long nativePtr) { + private AppBannerInfoBarDelegateAndroid(long nativePtr) { mNativePointer = nativePtr; mListener = createApplicationStateListener(); ApplicationStatus.registerApplicationStateListener(mListener); @@ -129,12 +129,12 @@ public class AppBannerInfoBarDelegate { @CalledByNative private int determineInstallState(AppData data) { - if (mInstallTask != null) return AppBannerInfoBar.INSTALL_STATE_INSTALLING; + if (mInstallTask != null) return AppBannerInfoBarAndroid.INSTALL_STATE_INSTALLING; PackageManager pm = getPackageManager(ApplicationStatus.getApplicationContext()); boolean isInstalled = InstallerDelegate.isInstalled(pm, data.packageName()); - return isInstalled ? AppBannerInfoBar.INSTALL_STATE_INSTALLED - : AppBannerInfoBar.INSTALL_STATE_NOT_INSTALLED; + return isInstalled ? AppBannerInfoBarAndroid.INSTALL_STATE_INSTALLED + : AppBannerInfoBarAndroid.INSTALL_STATE_NOT_INSTALLED; } private PackageManager getPackageManager(Context context) { @@ -143,13 +143,13 @@ public class AppBannerInfoBarDelegate { } @CalledByNative - private static AppBannerInfoBarDelegate create(long nativePtr) { - return new AppBannerInfoBarDelegate(nativePtr); + private static AppBannerInfoBarDelegateAndroid create(long nativePtr) { + return new AppBannerInfoBarDelegateAndroid(nativePtr); } private native void nativeOnInstallIntentReturned( - long nativeAppBannerInfoBarDelegate, boolean isInstalling); + long nativeAppBannerInfoBarDelegateAndroid, boolean isInstalling); private native void nativeOnInstallFinished( - long nativeAppBannerInfoBarDelegate, boolean success); - private native void nativeUpdateInstallState(long nativeAppBannerInfoBarDelegate); -}
\ No newline at end of file + long nativeAppBannerInfoBarDelegateAndroid, boolean success); + private native void nativeUpdateInstallState(long nativeAppBannerInfoBarDelegateAndroid); +} diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java index 6107c0b..6e2e8c9 100644 --- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java +++ b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java @@ -25,8 +25,8 @@ import org.chromium.base.test.util.Feature; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.infobar.AnimationHelper; -import org.chromium.chrome.browser.infobar.AppBannerInfoBar; -import org.chromium.chrome.browser.infobar.AppBannerInfoBarDelegate; +import org.chromium.chrome.browser.infobar.AppBannerInfoBarAndroid; +import org.chromium.chrome.browser.infobar.AppBannerInfoBarDelegateAndroid; import org.chromium.chrome.browser.infobar.InfoBar; import org.chromium.chrome.browser.infobar.InfoBarContainer; import org.chromium.chrome.shell.ChromeShellTestBase; @@ -127,7 +127,7 @@ public class AppBannerManagerTest extends ChromeShellTestBase { mPackageManager = new TestPackageManager(); AppBannerManager.setAppDetailsDelegate(mDetailsDelegate); AppBannerManager.setIsEnabledForTesting(true); - AppBannerInfoBarDelegate.setPackageManagerForTesting(mPackageManager); + AppBannerInfoBarDelegateAndroid.setPackageManagerForTesting(mPackageManager); clearAppData(); super.setUp(); @@ -166,7 +166,7 @@ public class AppBannerManagerTest extends ChromeShellTestBase { InfoBarContainer container = getActivity().getActiveTab().getInfoBarContainer(); ArrayList<InfoBar> infobars = container.getInfoBars(); if (infobars.size() != 1) return false; - if (!(infobars.get(0) instanceof AppBannerInfoBar)) return false; + if (!(infobars.get(0) instanceof AppBannerInfoBarAndroid)) return false; TextView textView = (TextView) infobars.get(0).getContentWrapper().findViewById(R.id.app_name); diff --git a/chrome/browser/android/banners/app_banner_data_fetcher_android.cc b/chrome/browser/android/banners/app_banner_data_fetcher_android.cc index bc0662e..29934f4 100644 --- a/chrome/browser/android/banners/app_banner_data_fetcher_android.cc +++ b/chrome/browser/android/banners/app_banner_data_fetcher_android.cc @@ -4,8 +4,8 @@ #include "chrome/browser/android/banners/app_banner_data_fetcher_android.h" -#include "chrome/browser/android/banners/app_banner_infobar_delegate.h" -#include "chrome/browser/ui/android/infobars/app_banner_infobar.h" +#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" +#include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h" #include "third_party/skia/include/core/SkBitmap.h" namespace banners { @@ -49,23 +49,20 @@ infobars::InfoBar* AppBannerDataFetcherAndroid::CreateBanner( infobars::InfoBar* infobar = nullptr; if (native_app_data_.is_null()) { - scoped_ptr<AppBannerInfoBarDelegate> delegate( - new AppBannerInfoBarDelegate(event_request_id(), - title, - new SkBitmap(*icon), - web_app_data())); + scoped_ptr<AppBannerInfoBarDelegateAndroid> delegate( + new AppBannerInfoBarDelegateAndroid( + event_request_id(), title, new SkBitmap(*icon), web_app_data())); - infobar = new AppBannerInfoBar(delegate.Pass(), web_app_data().start_url); + infobar = + new AppBannerInfoBarAndroid(delegate.Pass(), web_app_data().start_url); if (infobar) RecordDidShowBanner("AppBanner.WebApp.Shown"); } else { - scoped_ptr<AppBannerInfoBarDelegate> delegate( - new AppBannerInfoBarDelegate(event_request_id(), - title, - new SkBitmap(*icon), - native_app_data_, - native_app_package_)); - infobar = new AppBannerInfoBar(delegate.Pass(), native_app_data_); + scoped_ptr<AppBannerInfoBarDelegateAndroid> delegate( + new AppBannerInfoBarDelegateAndroid( + event_request_id(), title, new SkBitmap(*icon), native_app_data_, + native_app_package_)); + infobar = new AppBannerInfoBarAndroid(delegate.Pass(), native_app_data_); if (infobar) RecordDidShowBanner("AppBanner.NativeApp.Shown"); } diff --git a/chrome/browser/android/banners/app_banner_infobar_delegate.cc b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc index 86534b2..ac212f5 100644 --- a/chrome/browser/android/banners/app_banner_infobar_delegate.cc +++ b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/android/banners/app_banner_infobar_delegate.h" +#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" @@ -17,7 +17,7 @@ #include "chrome/browser/banners/app_banner_settings_helper.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/infobars/infobar_service.h" -#include "chrome/browser/ui/android/infobars/app_banner_infobar.h" +#include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h" #include "chrome/common/render_messages.h" #include "chrome/grit/generated_resources.h" #include "components/rappor/rappor_utils.h" @@ -25,7 +25,7 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/manifest.h" -#include "jni/AppBannerInfoBarDelegate_jni.h" +#include "jni/AppBannerInfoBarDelegateAndroid_jni.h" #include "ui/gfx/android/java_bitmap.h" using base::android::ConvertJavaStringToUTF8; @@ -35,7 +35,7 @@ using base::android::ConvertUTF16ToJavaString; namespace banners { -AppBannerInfoBarDelegate::AppBannerInfoBarDelegate( +AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid( int event_request_id, const base::string16& app_title, SkBitmap* app_icon, @@ -48,7 +48,7 @@ AppBannerInfoBarDelegate::AppBannerInfoBarDelegate( CreateJavaDelegate(); } -AppBannerInfoBarDelegate::AppBannerInfoBarDelegate( +AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid( int event_request_id, const base::string16& app_title, SkBitmap* app_icon, @@ -63,26 +63,28 @@ AppBannerInfoBarDelegate::AppBannerInfoBarDelegate( CreateJavaDelegate(); } -AppBannerInfoBarDelegate::~AppBannerInfoBarDelegate() { +AppBannerInfoBarDelegateAndroid::~AppBannerInfoBarDelegateAndroid() { TrackDismissEvent(DISMISS_EVENT_DISMISSED); JNIEnv* env = base::android::AttachCurrentThread(); - Java_AppBannerInfoBarDelegate_destroy(env, + Java_AppBannerInfoBarDelegateAndroid_destroy(env, java_delegate_.obj()); java_delegate_.Reset(); } -void AppBannerInfoBarDelegate::UpdateInstallState(JNIEnv* env, jobject obj) { +void AppBannerInfoBarDelegateAndroid::UpdateInstallState(JNIEnv* env, + jobject obj) { if (native_app_data_.is_null()) return; - int newState = Java_AppBannerInfoBarDelegate_determineInstallState( + int newState = Java_AppBannerInfoBarDelegateAndroid_determineInstallState( env, java_delegate_.obj(), native_app_data_.obj()); - static_cast<AppBannerInfoBar*>(infobar())->OnInstallStateChanged(newState); + static_cast<AppBannerInfoBarAndroid*>(infobar()) + ->OnInstallStateChanged(newState); } -void AppBannerInfoBarDelegate::OnInstallIntentReturned( +void AppBannerInfoBarDelegateAndroid::OnInstallIntentReturned( JNIEnv* env, jobject obj, jboolean jis_installing) { @@ -111,7 +113,7 @@ void AppBannerInfoBarDelegate::OnInstallIntentReturned( UpdateInstallState(env, obj); } -void AppBannerInfoBarDelegate::OnInstallFinished(JNIEnv* env, +void AppBannerInfoBarDelegateAndroid::OnInstallFinished(JNIEnv* env, jobject obj, jboolean success) { if (!infobar()) @@ -126,14 +128,14 @@ void AppBannerInfoBarDelegate::OnInstallFinished(JNIEnv* env, } } -void AppBannerInfoBarDelegate::CreateJavaDelegate() { +void AppBannerInfoBarDelegateAndroid::CreateJavaDelegate() { JNIEnv* env = base::android::AttachCurrentThread(); - java_delegate_.Reset(Java_AppBannerInfoBarDelegate_create( + java_delegate_.Reset(Java_AppBannerInfoBarDelegateAndroid_create( env, reinterpret_cast<intptr_t>(this))); } -void AppBannerInfoBarDelegate::SendBannerAccepted( +void AppBannerInfoBarDelegateAndroid::SendBannerAccepted( content::WebContents* web_contents, const std::string& platform) { web_contents->GetMainFrame()->Send( @@ -143,11 +145,11 @@ void AppBannerInfoBarDelegate::SendBannerAccepted( platform)); } -gfx::Image AppBannerInfoBarDelegate::GetIcon() const { +gfx::Image AppBannerInfoBarDelegateAndroid::GetIcon() const { return gfx::Image::CreateFrom1xBitmap(*app_icon_.get()); } -void AppBannerInfoBarDelegate::InfoBarDismissed() { +void AppBannerInfoBarDelegateAndroid::InfoBarDismissed() { content::WebContents* web_contents = InfoBarService::WebContentsFromInfoBar(infobar()); if (!web_contents) @@ -183,15 +185,15 @@ void AppBannerInfoBarDelegate::InfoBarDismissed() { } } -base::string16 AppBannerInfoBarDelegate::GetMessageText() const { +base::string16 AppBannerInfoBarDelegateAndroid::GetMessageText() const { return app_title_; } -int AppBannerInfoBarDelegate::GetButtons() const { +int AppBannerInfoBarDelegateAndroid::GetButtons() const { return BUTTON_OK; } -bool AppBannerInfoBarDelegate::Accept() { +bool AppBannerInfoBarDelegateAndroid::Accept() { content::WebContents* web_contents = InfoBarService::WebContentsFromInfoBar(infobar()); if (!web_contents) { @@ -208,7 +210,7 @@ bool AppBannerInfoBarDelegate::Accept() { return true; } - bool was_opened = Java_AppBannerInfoBarDelegate_installOrOpenNativeApp( + bool was_opened = Java_AppBannerInfoBarDelegateAndroid_installOrOpenNativeApp( env, java_delegate_.obj(), tab->GetJavaObject().obj(), @@ -248,7 +250,8 @@ bool AppBannerInfoBarDelegate::Accept() { return true; } -bool AppBannerInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { +bool AppBannerInfoBarDelegateAndroid::LinkClicked( + WindowOpenDisposition disposition) { if (native_app_data_.is_null()) return false; @@ -264,7 +267,7 @@ bool AppBannerInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { return true; } - Java_AppBannerInfoBarDelegate_showAppDetails(env, + Java_AppBannerInfoBarDelegateAndroid_showAppDetails(env, java_delegate_.obj(), tab->GetJavaObject().obj(), native_app_data_.obj()); @@ -273,7 +276,7 @@ bool AppBannerInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { return true; } -bool RegisterAppBannerInfoBarDelegate(JNIEnv* env) { +bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) { return RegisterNativesImpl(env); } diff --git a/chrome/browser/android/banners/app_banner_infobar_delegate.h b/chrome/browser/android/banners/app_banner_infobar_delegate_android.h index c91177c..f912dfc 100644 --- a/chrome/browser/android/banners/app_banner_infobar_delegate.h +++ b/chrome/browser/android/banners/app_banner_infobar_delegate_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_H_ -#define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_H_ +#ifndef CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_ +#define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_ #include "base/android/scoped_java_ref.h" #include "base/strings/string16.h" @@ -25,24 +25,24 @@ class AppBannerInfoBar; namespace banners { // Manages installation of an app being promoted by a webpage. -class AppBannerInfoBarDelegate : public ConfirmInfoBarDelegate { +class AppBannerInfoBarDelegateAndroid : public ConfirmInfoBarDelegate { public: // Delegate for promoting a web app. - AppBannerInfoBarDelegate( + AppBannerInfoBarDelegateAndroid( int event_request_id, const base::string16& app_title, SkBitmap* app_icon, const content::Manifest& web_app_data); // Delegate for promoting an Android app. - AppBannerInfoBarDelegate( + AppBannerInfoBarDelegateAndroid( int event_request_id, const base::string16& app_title, SkBitmap* app_icon, const base::android::ScopedJavaGlobalRef<jobject>& native_app_data, const std::string& native_app_package); - ~AppBannerInfoBarDelegate() override; + ~AppBannerInfoBarDelegateAndroid() override; // Called when the AppBannerInfoBar's button needs to be updated. void UpdateInstallState(JNIEnv* env, jobject obj); @@ -82,12 +82,12 @@ class AppBannerInfoBarDelegate : public ConfirmInfoBarDelegate { base::android::ScopedJavaGlobalRef<jobject> native_app_data_; std::string native_app_package_; - DISALLOW_COPY_AND_ASSIGN(AppBannerInfoBarDelegate); -}; // AppBannerInfoBarDelegate + DISALLOW_COPY_AND_ASSIGN(AppBannerInfoBarDelegateAndroid); +}; // AppBannerInfoBarDelegateAndroid // Register native methods. -bool RegisterAppBannerInfoBarDelegate(JNIEnv* env); +bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env); } // namespace banners -#endif // CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_H_ +#endif // CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_ diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc index c4e333b..8d3206e 100644 --- a/chrome/browser/android/chrome_jni_registrar.cc +++ b/chrome/browser/android/chrome_jni_registrar.cc @@ -10,7 +10,7 @@ #include "chrome/browser/android/accessibility/font_size_prefs_android.h" #include "chrome/browser/android/accessibility_util.h" #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" -#include "chrome/browser/android/banners/app_banner_infobar_delegate.h" +#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" #include "chrome/browser/android/banners/app_banner_manager_android.h" #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h" @@ -95,7 +95,7 @@ #include "chrome/browser/ui/android/connection_info_popup_android.h" #include "chrome/browser/ui/android/context_menu_helper.h" #include "chrome/browser/ui/android/infobars/account_chooser_infobar.h" -#include "chrome/browser/ui/android/infobars/app_banner_infobar.h" +#include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h" #include "chrome/browser/ui/android/infobars/confirm_infobar.h" #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" #include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h" @@ -148,8 +148,9 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { {"AndroidProfileOAuth2TokenService", AndroidProfileOAuth2TokenService::Register}, {"AnswersImageBridge", RegisterAnswersImageBridge}, - {"AppBannerInfoBar", RegisterAppBannerInfoBar}, - {"AppBannerInfoBarDelegate", banners::RegisterAppBannerInfoBarDelegate}, + {"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid}, + {"AppBannerInfoBarDelegateAndroid", + banners::RegisterAppBannerInfoBarDelegateAndroid}, {"AppBannerManagerAndroid", banners::AppBannerManagerAndroid::Register}, {"ApplicationLifetime", RegisterApplicationLifetimeAndroid}, {"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid}, diff --git a/chrome/browser/ui/android/infobars/app_banner_infobar.cc b/chrome/browser/ui/android/infobars/app_banner_infobar_android.cc index bdc868f..16e8f14 100644 --- a/chrome/browser/ui/android/infobars/app_banner_infobar.cc +++ b/chrome/browser/ui/android/infobars/app_banner_infobar_android.cc @@ -2,37 +2,37 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/android/infobars/app_banner_infobar.h" +#include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "chrome/browser/android/banners/app_banner_infobar_delegate.h" -#include "jni/AppBannerInfoBar_jni.h" +#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" +#include "jni/AppBannerInfoBarAndroid_jni.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "ui/gfx/android/java_bitmap.h" #include "ui/gfx/image/image.h" -AppBannerInfoBar::AppBannerInfoBar( - scoped_ptr<banners::AppBannerInfoBarDelegate> delegate, +AppBannerInfoBarAndroid::AppBannerInfoBarAndroid( + scoped_ptr<banners::AppBannerInfoBarDelegateAndroid> delegate, const base::android::ScopedJavaGlobalRef<jobject>& japp_data) : ConfirmInfoBar(delegate.Pass()), japp_data_(japp_data) { } -AppBannerInfoBar::AppBannerInfoBar( - scoped_ptr<banners::AppBannerInfoBarDelegate> delegate, +AppBannerInfoBarAndroid::AppBannerInfoBarAndroid( + scoped_ptr<banners::AppBannerInfoBarDelegateAndroid> delegate, const GURL& app_url) : ConfirmInfoBar(delegate.Pass()), app_url_(app_url) { } -AppBannerInfoBar::~AppBannerInfoBar() { +AppBannerInfoBarAndroid::~AppBannerInfoBarAndroid() { } base::android::ScopedJavaLocalRef<jobject> -AppBannerInfoBar::CreateRenderInfoBar(JNIEnv* env) { +AppBannerInfoBarAndroid::CreateRenderInfoBar(JNIEnv* env) { ConfirmInfoBarDelegate* app_banner_infobar_delegate = GetDelegate(); base::android::ScopedJavaLocalRef<jstring> app_title = @@ -47,7 +47,7 @@ AppBannerInfoBar::CreateRenderInfoBar(JNIEnv* env) { base::android::ScopedJavaLocalRef<jobject> infobar; if (!japp_data_.is_null()) { - infobar.Reset(Java_AppBannerInfoBar_createNativeAppInfoBar( + infobar.Reset(Java_AppBannerInfoBarAndroid_createNativeAppInfoBar( env, reinterpret_cast<intptr_t>(this), app_title.obj(), @@ -63,7 +63,7 @@ AppBannerInfoBar::CreateRenderInfoBar(JNIEnv* env) { base::android::ScopedJavaLocalRef<jstring> app_url = base::android::ConvertUTF8ToJavaString(env, trimmed_url); - infobar.Reset(Java_AppBannerInfoBar_createWebAppInfoBar( + infobar.Reset(Java_AppBannerInfoBarAndroid_createWebAppInfoBar( env, reinterpret_cast<intptr_t>(this), app_title.obj(), @@ -75,15 +75,14 @@ AppBannerInfoBar::CreateRenderInfoBar(JNIEnv* env) { return infobar; } -void AppBannerInfoBar::OnInstallStateChanged(int new_state) { +void AppBannerInfoBarAndroid::OnInstallStateChanged(int new_state) { JNIEnv* env = base::android::AttachCurrentThread(); - Java_AppBannerInfoBar_onInstallStateChanged(env, - java_infobar_.obj(), - new_state); + Java_AppBannerInfoBarAndroid_onInstallStateChanged(env, java_infobar_.obj(), + new_state); } // Native JNI methods --------------------------------------------------------- -bool RegisterAppBannerInfoBar(JNIEnv* env) { +bool RegisterAppBannerInfoBarAndroid(JNIEnv* env) { return RegisterNativesImpl(env); } diff --git a/chrome/browser/ui/android/infobars/app_banner_infobar.h b/chrome/browser/ui/android/infobars/app_banner_infobar_android.h index 72ef28e..9cc364ec 100644 --- a/chrome/browser/ui/android/infobars/app_banner_infobar.h +++ b/chrome/browser/ui/android/infobars/app_banner_infobar_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_ANDROID_INFOBARS_APP_BANNER_INFOBAR_H_ -#define CHROME_BROWSER_UI_ANDROID_INFOBARS_APP_BANNER_INFOBAR_H_ +#ifndef CHROME_BROWSER_UI_ANDROID_INFOBARS_APP_BANNER_INFOBAR_ANDROID_H_ +#define CHROME_BROWSER_UI_ANDROID_INFOBARS_APP_BANNER_INFOBAR_ANDROID_H_ #include "base/android/scoped_java_ref.h" #include "base/basictypes.h" @@ -11,23 +11,23 @@ #include "url/gurl.h" namespace banners { -class AppBannerInfoBarDelegate; +class AppBannerInfoBarDelegateAndroid; } // namespace banners -class AppBannerInfoBar : public ConfirmInfoBar { +class AppBannerInfoBarAndroid : public ConfirmInfoBar { public: - // Constructs an AppBannerInfoBar promoting a native app. - AppBannerInfoBar( - scoped_ptr<banners::AppBannerInfoBarDelegate> delegate, + // Constructs an AppBannerInfoBarAndroid promoting a native app. + AppBannerInfoBarAndroid( + scoped_ptr<banners::AppBannerInfoBarDelegateAndroid> delegate, const base::android::ScopedJavaGlobalRef<jobject>& japp_data); - // Constructs an AppBannerInfoBar promoting a web app. - AppBannerInfoBar( - scoped_ptr<banners::AppBannerInfoBarDelegate> delegate, + // Constructs an AppBannerInfoBarAndroid promoting a web app. + AppBannerInfoBarAndroid( + scoped_ptr<banners::AppBannerInfoBarDelegateAndroid> delegate, const GURL& app_url); - ~AppBannerInfoBar() override; + ~AppBannerInfoBarAndroid() override; // Called when the installation state of the app may have changed. // Updates the InfoBar visuals to match the new state and re-enables controls @@ -47,10 +47,10 @@ class AppBannerInfoBar : public ConfirmInfoBar { base::android::ScopedJavaGlobalRef<jobject> java_infobar_; - DISALLOW_COPY_AND_ASSIGN(AppBannerInfoBar); + DISALLOW_COPY_AND_ASSIGN(AppBannerInfoBarAndroid); }; // Register native methods. -bool RegisterAppBannerInfoBar(JNIEnv* env); +bool RegisterAppBannerInfoBarAndroid(JNIEnv* env); -#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_APP_BANNER_INFOBAR_H_ +#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_APP_BANNER_INFOBAR_ANDROID_H_ diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 2a17889..468e138 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -33,8 +33,8 @@ 'browser/android/appmenu/app_menu_drag_helper.h', 'browser/android/banners/app_banner_data_fetcher_android.cc', 'browser/android/banners/app_banner_data_fetcher_android.h', - 'browser/android/banners/app_banner_infobar_delegate.cc', - 'browser/android/banners/app_banner_infobar_delegate.h', + 'browser/android/banners/app_banner_infobar_delegate_android.cc', + 'browser/android/banners/app_banner_infobar_delegate_android.h', 'browser/android/banners/app_banner_manager_android.cc', 'browser/android/banners/app_banner_manager_android.h', 'browser/android/bookmarks/bookmarks_bridge.cc', @@ -1731,9 +1731,9 @@ 'android/java/src/org/chromium/chrome/browser/WarmupManager.java', 'android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java', 'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java', - 'android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBar.java', + 'android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java', 'android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java', - 'android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegate.java', + 'android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java', 'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java', 'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java', 'android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java', diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 7b72c67..f2508a4 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -39,8 +39,8 @@ 'browser/ui/android/context_menu_helper.cc', 'browser/ui/android/context_menu_helper.h', 'browser/ui/android/external_protocol_dialog_android.cc', - 'browser/ui/android/infobars/app_banner_infobar.cc', - 'browser/ui/android/infobars/app_banner_infobar.h', + 'browser/ui/android/infobars/app_banner_infobar_android.cc', + 'browser/ui/android/infobars/app_banner_infobar_android.h', 'browser/ui/android/infobars/confirm_infobar.cc', 'browser/ui/android/infobars/confirm_infobar.h', 'browser/ui/android/infobars/data_reduction_proxy_infobar.cc', |