Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3310)

Unified Diff: chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.cc

Issue 1392023004: Rename android only infobars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try again Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.cc b/chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.cc
index 1f669b8a3f3f22ff6d839b5a0ef1d811d3c92742..f44def98c6b7998f0085f18d7be7a66e71a05913 100644
--- a/chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.cc
+++ b/chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.cc
@@ -8,7 +8,7 @@
#include "base/android/jni_string.h"
#include "base/logging.h"
#include "chrome/browser/android/resource_mapper.h"
-#include "chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.h"
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate_android.h"
#include "content/public/browser/web_contents.h"
#include "jni/DataReductionProxyInfoBarDelegate_jni.h"
@@ -20,7 +20,7 @@ void DataReductionProxyInfoBar::Launch(
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
DCHECK(web_contents);
- DataReductionProxyInfoBarDelegate::Create(
+ DataReductionProxyInfoBarDelegateAndroid::Create(
web_contents, base::android::ConvertJavaStringToUTF8(env, jlink_url));
}
@@ -30,9 +30,8 @@ bool DataReductionProxyInfoBar::Register(JNIEnv* env) {
}
DataReductionProxyInfoBar::DataReductionProxyInfoBar(
- scoped_ptr<DataReductionProxyInfoBarDelegate> delegate)
- : ConfirmInfoBar(delegate.Pass()), java_data_reduction_proxy_delegate_() {
-}
+ scoped_ptr<DataReductionProxyInfoBarDelegateAndroid> delegate)
+ : ConfirmInfoBar(delegate.Pass()), java_data_reduction_proxy_delegate_() {}
DataReductionProxyInfoBar::~DataReductionProxyInfoBar() {
}
@@ -46,22 +45,22 @@ DataReductionProxyInfoBar::CreateRenderInfoBar(JNIEnv* env) {
env, java_data_reduction_proxy_delegate_.obj(), GetEnumeratedIconId());
}
-DataReductionProxyInfoBarDelegate* DataReductionProxyInfoBar::GetDelegate() {
- return static_cast<DataReductionProxyInfoBarDelegate*>(delegate());
+DataReductionProxyInfoBarDelegateAndroid*
+DataReductionProxyInfoBar::GetDelegate() {
+ return static_cast<DataReductionProxyInfoBarDelegateAndroid*>(delegate());
}
-
// DataReductionProxyInfoBarDelegate:
// static
-scoped_ptr<infobars::InfoBar> DataReductionProxyInfoBarDelegate::CreateInfoBar(
+scoped_ptr<infobars::InfoBar>
+DataReductionProxyInfoBarDelegateAndroid::CreateInfoBar(
infobars::InfoBarManager* infobar_manager,
- scoped_ptr<DataReductionProxyInfoBarDelegate> delegate) {
+ scoped_ptr<DataReductionProxyInfoBarDelegateAndroid> delegate) {
return scoped_ptr<infobars::InfoBar>(
new DataReductionProxyInfoBar(delegate.Pass()));
}
-
// JNI for DataReductionProxyInfoBarDelegate.
void Launch(JNIEnv* env,
const JavaParamRef<jclass>& clazz,

Powered by Google App Engine
This is Rietveld 408576698