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

Side by Side Diff: chrome/browser/extensions/theme_installed_infobar_delegate.cc

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

Powered by Google App Engine
This is Rietveld 408576698