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

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

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
« no previous file with comments | « chrome/browser/ui/gtk/gtk_util.cc ('k') | chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/location_bar_view_gtk.cc (revision 145001)
+++ chrome/browser/ui/gtk/location_bar_view_gtk.cc (working copy)
@@ -42,6 +42,7 @@
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
#include "chrome/browser/ui/content_settings/content_setting_image_model.h"
#include "chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h"
@@ -461,7 +462,7 @@
}
WebContents* LocationBarViewGtk::GetWebContents() const {
- return browser_->GetActiveWebContents();
+ return chrome::GetActiveWebContents(browser_);
}
void LocationBarViewGtk::SetPreviewEnabledPageAction(
@@ -667,7 +668,7 @@
}
TabContents* LocationBarViewGtk::GetTabContents() const {
- return browser_->GetActiveTabContents();
+ return chrome::GetActiveTabContents(browser_);
}
void LocationBarViewGtk::ShowFirstRunBubble() {
@@ -757,7 +758,7 @@
WebContents* contents = GetWebContents();
if (!page_action_views_.empty() && contents) {
- GURL url = browser()->GetActiveWebContents()->GetURL();
+ GURL url = chrome::GetActiveWebContents(browser())->GetURL();
for (size_t i = 0; i < page_action_views_.size(); i++) {
page_action_views_[i]->UpdateVisibility(
« no previous file with comments | « chrome/browser/ui/gtk/gtk_util.cc ('k') | chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698