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

Side by Side Diff: chrome/browser/ui/android/infobars/confirm_infobar.cc

Issue 812823002: Remove dependency of infobars component on the embedder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests by instanciating a TestConfirmInfoBarDelegateFactory Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" 5 #include "chrome/browser/ui/android/infobars/confirm_infobar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/android/resource_mapper.h" 10 #include "chrome/browser/android/resource_mapper.h"
11 #include "chrome/browser/infobars/chrome_confirm_infobar_delegate_factory.h"
11 #include "components/infobars/core/confirm_infobar_delegate.h" 12 #include "components/infobars/core/confirm_infobar_delegate.h"
12 #include "jni/ConfirmInfoBarDelegate_jni.h" 13 #include "jni/ConfirmInfoBarDelegate_jni.h"
13 14
15 // ChromeConfirmInfoBarDelegateFactory ----------------------------------------
14 16
15 // ConfirmInfoBarDelegate ----------------------------------------------------- 17 scoped_ptr<infobars::InfoBar>
16 18 ChromeConfirmInfoBarDelegateFactory::CreateInfoBar(
17 // static
18 scoped_ptr<infobars::InfoBar> ConfirmInfoBarDelegate::CreateInfoBar(
19 scoped_ptr<ConfirmInfoBarDelegate> delegate) { 19 scoped_ptr<ConfirmInfoBarDelegate> delegate) {
20 return make_scoped_ptr(new ConfirmInfoBar(delegate.Pass())); 20 return make_scoped_ptr(new ConfirmInfoBar(delegate.Pass()));
21 } 21 }
22 22
23 23
24 // ConfirmInfoBar ------------------------------------------------------------- 24 // ConfirmInfoBar -------------------------------------------------------------
25 25
26 ConfirmInfoBar::ConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate> delegate) 26 ConfirmInfoBar::ConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate> delegate)
27 : InfoBarAndroid(delegate.Pass()), java_confirm_delegate_() { 27 : InfoBarAndroid(delegate.Pass()), java_confirm_delegate_() {
28 } 28 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return (delegate->GetButtons() & button) ? 84 return (delegate->GetButtons() & button) ?
85 delegate->GetButtonLabel(button) : base::string16(); 85 delegate->GetButtonLabel(button) : base::string16();
86 } 86 }
87 87
88 88
89 // Native JNI methods --------------------------------------------------------- 89 // Native JNI methods ---------------------------------------------------------
90 90
91 bool RegisterConfirmInfoBarDelegate(JNIEnv* env) { 91 bool RegisterConfirmInfoBarDelegate(JNIEnv* env) {
92 return RegisterNativesImpl(env); 92 return RegisterNativesImpl(env);
93 } 93 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698