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

Unified Diff: chrome/browser/extensions/theme_installed_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
Index: chrome/browser/extensions/theme_installed_infobar_delegate.cc
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index 986250e999d12d6e68d2e56b35683f60d844ee0e..2b9b673b142a9a0ecf55456b83207dbb7a7b768d 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -9,13 +9,13 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/infobars/infobar.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "components/infobars/core/infobar.h"
#include "content/public/browser/notification_source.h"
#include "extensions/common/extension.h"
#include "grit/generated_resources.h"
@@ -48,15 +48,16 @@ void ThemeInstalledInfoBarDelegate::Create(
InfoBarService* infobar_service =
InfoBarService::FromWebContents(web_contents);
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
- scoped_ptr<InfoBar> new_infobar(ConfirmInfoBarDelegate::CreateInfoBar(
- scoped_ptr<ConfirmInfoBarDelegate>(new ThemeInstalledInfoBarDelegate(
- profile->GetExtensionService(), theme_service, new_theme,
- previous_theme_id, previous_using_native_theme))));
+ scoped_ptr<infobars::InfoBar> new_infobar(
+ ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
+ new ThemeInstalledInfoBarDelegate(
+ profile->GetExtensionService(), theme_service, new_theme,
+ previous_theme_id, previous_using_native_theme))));
// If there's a previous theme infobar, just replace that instead of adding a
// new one.
for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
- InfoBar* old_infobar = infobar_service->infobar_at(i);
+ infobars::InfoBar* old_infobar = infobar_service->infobar_at(i);
ThemeInstalledInfoBarDelegate* theme_infobar =
old_infobar->delegate()->AsThemePreviewInfobarDelegate();
if (theme_infobar) {
@@ -106,7 +107,8 @@ int ThemeInstalledInfoBarDelegate::GetIconID() const {
return IDR_INFOBAR_THEME;
}
-InfoBarDelegate::Type ThemeInstalledInfoBarDelegate::GetInfoBarType() const {
+infobars::InfoBarDelegate::Type ThemeInstalledInfoBarDelegate::GetInfoBarType()
+ const {
return PAGE_ACTION_TYPE;
}

Powered by Google App Engine
This is Rietveld 408576698