Move Infobars core files to the Infobars component

chrome/browser/extensions/theme_installed_infobar_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 
 #include <string>
 
 #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"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // static
 void ThemeInstalledInfoBarDelegate::Create(
     const extensions::Extension* new_theme,
@@ skipping 12 matching lines @@
       chrome::FindTabbedBrowser(profile, true, chrome::GetActiveDesktop());
   if (!browser)
     return;
   content::WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return;
   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) {
       // If the user installed the same theme twice, ignore the second install
       // and keep the first install info bar, so that they can easily undo to
       // get back the previous theme.
       if (theme_infobar->theme_id_ != new_theme->id()) {
         infobar_service->ReplaceInfoBar(old_infobar, new_infobar.Pass());
         theme_service->OnInfobarDisplayed();
       }
@@ skipping 29 matching lines @@
 
   theme_service_->OnInfobarDestroyed();
 }
 
 int ThemeInstalledInfoBarDelegate::GetIconID() const {
   // TODO(aa): Reply with the theme's icon, but this requires reading it
   // asynchronously from disk.
   return IDR_INFOBAR_THEME;
 }
 
-InfoBarDelegate::Type ThemeInstalledInfoBarDelegate::GetInfoBarType() const {
+infobars::InfoBarDelegate::Type ThemeInstalledInfoBarDelegate::GetInfoBarType()
+    const {
   return PAGE_ACTION_TYPE;
 }
 
 ThemeInstalledInfoBarDelegate*
     ThemeInstalledInfoBarDelegate::AsThemePreviewInfobarDelegate() {
   return this;
 }
 
 base::string16 ThemeInstalledInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_THEME_INSTALL_INFOBAR_LABEL,
@@ skipping 30 matching lines @@
 void ThemeInstalledInfoBarDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type);
   // If the new theme is different from what this info bar is associated with,
   // close this info bar since it is no longer relevant.
   if (theme_id_ != theme_service_->GetThemeID())
     infobar()->RemoveSelf();
 }