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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

Issue 211273007: Split InfoBarService core code into InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix android compilation Created 6 years, 9 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
« chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc ('K') | « chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm ('k') | chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm » ('j') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm
diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm
index 3c8e71cc3902c653e9f06e9b3aaf0fc917609d9e..0a5d9ca7e8624b7e234e5af2c253f26f30222f29 100644
--- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm
@@ -68,12 +68,13 @@
- (void)changeWebContents:(content::WebContents*)contents {
currentWebContents_ = contents;
+ InfoBarManager* infobar_manager = NULL;
if (contents) {
- containerCocoa_->ChangeInfoBarService(
- InfoBarService::FromWebContents(contents));
- } else {
- containerCocoa_->ChangeInfoBarService(NULL);
+ InfoBarService* infobar_service = InfoBarService::FromWebContents(contents);
+ if (infobar_service)
+ infobar_manager = &infobar_service->infobar_manager();
}
+ containerCocoa_->ChangeInfoBarManager(infobar_manager);
}
- (void)tabDetachedWithContents:(content::WebContents*)contents {
« chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc ('K') | « chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm ('k') | chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm » ('j') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698