| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/theme_installed_infobar_delegate.h" | 5 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| 11 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
| 12 #include "chrome/browser/infobars/infobar.h" | 12 #include "chrome/browser/infobars/infobar.h" |
| 13 #include "chrome/browser/infobars/infobar_manager.h" | |
| 14 #include "chrome/browser/infobars/infobar_service.h" | 13 #include "chrome/browser/infobars/infobar_service.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/themes/theme_service.h" | 15 #include "chrome/browser/themes/theme_service.h" |
| 17 #include "chrome/browser/themes/theme_service_factory.h" | 16 #include "chrome/browser/themes/theme_service_factory.h" |
| 18 #include "chrome/browser/ui/browser_finder.h" | 17 #include "chrome/browser/ui/browser_finder.h" |
| 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 20 #include "content/public/browser/notification_source.h" | 19 #include "content/public/browser/notification_source.h" |
| 21 #include "extensions/common/extension.h" | 20 #include "extensions/common/extension.h" |
| 22 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 23 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 41 Browser* browser = | 40 Browser* browser = |
| 42 chrome::FindTabbedBrowser(profile, true, chrome::GetActiveDesktop()); | 41 chrome::FindTabbedBrowser(profile, true, chrome::GetActiveDesktop()); |
| 43 if (!browser) | 42 if (!browser) |
| 44 return; | 43 return; |
| 45 content::WebContents* web_contents = | 44 content::WebContents* web_contents = |
| 46 browser->tab_strip_model()->GetActiveWebContents(); | 45 browser->tab_strip_model()->GetActiveWebContents(); |
| 47 if (!web_contents) | 46 if (!web_contents) |
| 48 return; | 47 return; |
| 49 InfoBarService* infobar_service = | 48 InfoBarService* infobar_service = |
| 50 InfoBarService::FromWebContents(web_contents); | 49 InfoBarService::FromWebContents(web_contents); |
| 51 InfoBarManager* infobar_manager = infobar_service->infobar_manager(); | |
| 52 ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); | 50 ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); |
| 53 scoped_ptr<InfoBar> new_infobar(ConfirmInfoBarDelegate::CreateInfoBar( | 51 scoped_ptr<InfoBar> new_infobar(ConfirmInfoBarDelegate::CreateInfoBar( |
| 54 scoped_ptr<ConfirmInfoBarDelegate>(new ThemeInstalledInfoBarDelegate( | 52 scoped_ptr<ConfirmInfoBarDelegate>(new ThemeInstalledInfoBarDelegate( |
| 55 profile->GetExtensionService(), theme_service, new_theme, | 53 profile->GetExtensionService(), theme_service, new_theme, |
| 56 previous_theme_id, previous_using_native_theme)))); | 54 previous_theme_id, previous_using_native_theme)))); |
| 57 | 55 |
| 58 // If there's a previous theme infobar, just replace that instead of adding a | 56 // If there's a previous theme infobar, just replace that instead of adding a |
| 59 // new one. | 57 // new one. |
| 60 for (size_t i = 0; i < infobar_manager->infobar_count(); ++i) { | 58 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { |
| 61 InfoBar* old_infobar = infobar_manager->infobar_at(i); | 59 InfoBar* old_infobar = infobar_service->infobar_at(i); |
| 62 ThemeInstalledInfoBarDelegate* theme_infobar = | 60 ThemeInstalledInfoBarDelegate* theme_infobar = |
| 63 old_infobar->delegate()->AsThemePreviewInfobarDelegate(); | 61 old_infobar->delegate()->AsThemePreviewInfobarDelegate(); |
| 64 if (theme_infobar) { | 62 if (theme_infobar) { |
| 65 // If the user installed the same theme twice, ignore the second install | 63 // If the user installed the same theme twice, ignore the second install |
| 66 // and keep the first install info bar, so that they can easily undo to | 64 // and keep the first install info bar, so that they can easily undo to |
| 67 // get back the previous theme. | 65 // get back the previous theme. |
| 68 if (theme_infobar->theme_id_ != new_theme->id()) { | 66 if (theme_infobar->theme_id_ != new_theme->id()) { |
| 69 infobar_service->ReplaceInfoBar(old_infobar, new_infobar.Pass()); | 67 infobar_service->ReplaceInfoBar(old_infobar, new_infobar.Pass()); |
| 70 theme_service->OnInfobarDisplayed(); | 68 theme_service->OnInfobarDisplayed(); |
| 71 } | 69 } |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 void ThemeInstalledInfoBarDelegate::Observe( | 150 void ThemeInstalledInfoBarDelegate::Observe( |
| 153 int type, | 151 int type, |
| 154 const content::NotificationSource& source, | 152 const content::NotificationSource& source, |
| 155 const content::NotificationDetails& details) { | 153 const content::NotificationDetails& details) { |
| 156 DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type); | 154 DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type); |
| 157 // If the new theme is different from what this info bar is associated with, | 155 // If the new theme is different from what this info bar is associated with, |
| 158 // close this info bar since it is no longer relevant. | 156 // close this info bar since it is no longer relevant. |
| 159 if (theme_id_ != theme_service_->GetThemeID()) | 157 if (theme_id_ != theme_service_->GetThemeID()) |
| 160 infobar()->RemoveSelf(); | 158 infobar()->RemoveSelf(); |
| 161 } | 159 } |
| OLD | NEW |