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

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

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 12 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/browser_titlebar.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_titlebar.cc
===================================================================
--- chrome/browser/ui/gtk/browser_titlebar.cc (revision 116109)
+++ chrome/browser/ui/gtk/browser_titlebar.cc (working copy)
@@ -54,6 +54,8 @@
#include "ui/gfx/image/image.h"
#include "ui/gfx/skbitmap_operations.h"
+using content::WebContents;
+
namespace {
// The space above the titlebars.
@@ -635,12 +637,12 @@
}
}
-void BrowserTitlebar::UpdateThrobber(TabContents* tab_contents) {
+void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) {
DCHECK(app_mode_favicon_);
- if (tab_contents && tab_contents->IsLoading()) {
+ if (web_contents && web_contents->IsLoading()) {
GdkPixbuf* icon_pixbuf =
- throbber_.GetNextFrame(tab_contents->IsWaitingForResponse());
+ throbber_.GetNextFrame(web_contents->IsWaitingForResponse());
gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
} else {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ -987,11 +989,11 @@
EncodingMenuController controller;
if (controller.DoesCommandBelongToEncodingMenu(command_id)) {
- TabContents* tab_contents =
- browser_window_->browser()->GetSelectedTabContents();
- if (tab_contents) {
+ WebContents* web_contents =
+ browser_window_->browser()->GetSelectedWebContents();
+ if (web_contents) {
return controller.IsItemChecked(browser_window_->browser()->profile(),
- tab_contents->GetEncoding(),
+ web_contents->GetEncoding(),
command_id);
}
return false;
« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698