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

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 9121064: Cleanup: Remove more uses of Browser::tabstrip_model(). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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
===================================================================
--- chrome/browser/ui/gtk/browser_window_gtk.cc (revision 120097)
+++ chrome/browser/ui/gtk/browser_window_gtk.cc (working copy)
@@ -4,9 +4,10 @@
#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include <dlfcn.h>
#include <gdk/gdkkeysyms.h>
-#include <dlfcn.h>
+#include <algorithm>
#include <string>
#include "base/base_paths.h"
@@ -809,8 +810,7 @@
browser_->GetSelectedWebContents());
}
-void BrowserWindowGtk::SetDevToolsDockSide(DevToolsDockSide side)
-{
+void BrowserWindowGtk::SetDevToolsDockSide(DevToolsDockSide side) {
if (devtools_dock_side_ == side)
return;
@@ -1273,7 +1273,7 @@
// We use index here rather than comparing |contents| because by this time
// the model has already removed |contents| from its list, so
// browser_->GetSelectedWebContents() will return NULL or something else.
- if (index == browser_->tabstrip_model()->active_index()) {
+ if (index == browser_->active_index()) {
infobar_container_->ChangeTabContents(NULL);
UpdateDevToolsForContents(NULL);
}
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/sync/browser_synced_window_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698