chrome/browser/ui/content_settings/media_setting_changed_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/content_settings/media_setting_changed_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/ui/content_settings/content_setting_bubble_model_unittest.cc ('k') | chrome/browser/ui/extensions/extension_install_ui_default.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/media_setting_changed_infobar_delegate.cc

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

index 1a924b4457d61889b3633939d7255a76e607a978..b5cbc99be5d29ef7b2902142f696350b5ad422f2 100644

--- a/chrome/browser/ui/content_settings/media_setting_changed_infobar_delegate.cc

+++ b/chrome/browser/ui/content_settings/media_setting_changed_infobar_delegate.cc

@@ -5,8 +5,8 @@

#include "chrome/browser/ui/content_settings/media_setting_changed_infobar_delegate.h"

#include "base/logging.h"

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

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

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

#include "content/public/browser/web_contents.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

@@ -31,8 +31,8 @@ int MediaSettingChangedInfoBarDelegate::GetIconID() const {

return IDR_INFOBAR_MEDIA_STREAM_CAMERA;

}

-InfoBarDelegate::Type

- MediaSettingChangedInfoBarDelegate::GetInfoBarType() const {

+infobars::InfoBarDelegate::Type

+MediaSettingChangedInfoBarDelegate::GetInfoBarType() const {

return PAGE_ACTION_TYPE;

}