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

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.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, 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
Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 58288972d72b7aee719122f1291ba2f93ef6dd9d..27b179220e6653c6cdb69f18c9674703600b50d6 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -802,8 +802,9 @@ void BrowserWindowGtk::OnActiveTabChanged(WebContents* old_contents,
// Update various elements that are interested in knowing the current
// WebContents.
- infobar_container_->ChangeInfoBarService(
- InfoBarService::FromWebContents(new_contents));
+ InfoBarManager* infobar_manager =
+ InfoBarService::InfoBarManagerFromWebContents(new_contents);
+ infobar_container_->ChangeInfoBarManager(infobar_manager);
contents_container_->SetTab(new_contents);
UpdateDevToolsForContents(new_contents);
@@ -1285,7 +1286,7 @@ void BrowserWindowGtk::TabDetachedAt(WebContents* contents, int index) {
// browser_->tab_strip_model()->GetActiveWebContents() will return NULL or
// something else.
if (index == browser_->tab_strip_model()->active_index()) {
- infobar_container_->ChangeInfoBarService(NULL);
+ infobar_container_->ChangeInfoBarManager(NULL);
UpdateDevToolsForContents(NULL);
}
contents_container_->DetachTab(contents);

Powered by Google App Engine
This is Rietveld 408576698