chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc - Issue 240193003: Move Infobars core files to the Infobars component

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

Issue 240193003: Move Infobars core files to the Infobars component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix nib name on mac Created 6 years, 8 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

« no previous file with comments | « chrome/browser/translate/translate_manager_render_view_host_unittest.cc ('k') | chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

diff --git a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

index 6fd09d84fa12ad39b1416ce434e278e5c641bbb6..2bc88c925088a7855a02dd14f8a28c65efcb1a62 100644

--- a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

+++ b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

@@ -6,12 +6,12 @@

#include "base/prefs/pref_service.h"

#include "chrome/browser/content_settings/host_content_settings_map.h"

-#include "chrome/browser/infobars/infobar.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"

#include "chrome/common/content_settings.h"

#include "chrome/common/content_settings_types.h"

+#include "components/infobars/core/infobar.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -23,10 +23,9 @@ void PopupBlockedInfoBarDelegate::Create(content::WebContents* web_contents,

const GURL& url = web_contents->GetURL();

Profile* profile =

Profile::FromBrowserContext(web_contents->GetBrowserContext());

- scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar(

- scoped_ptr<ConfirmInfoBarDelegate>(

- new PopupBlockedInfoBarDelegate(

- num_popups, url, profile->GetHostContentSettingsMap()))));

+ scoped_ptr<infobars::InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar(

+ scoped_ptr<ConfirmInfoBarDelegate>(new PopupBlockedInfoBarDelegate(

+ num_popups, url, profile->GetHostContentSettingsMap()))));

InfoBarService* infobar_service =

InfoBarService::FromWebContents(web_contents);

@@ -35,7 +34,7 @@ void PopupBlockedInfoBarDelegate::Create(content::WebContents* web_contents,

// will be shown once, then hide then be shown again.

// This will be fixed once we have an in place replace infobar mechanism.

for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {

- InfoBar* existing_infobar = infobar_service->infobar_at(i);

+ infobars::InfoBar* existing_infobar = infobar_service->infobar_at(i);

if (existing_infobar->delegate()->AsPopupBlockedInfoBarDelegate()) {

infobar_service->ReplaceInfoBar(existing_infobar, infobar.Pass());

return;