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

Unified Diff: chrome/browser/ui/gtk/gtk_util.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_window_gtk.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/gtk_util.cc
===================================================================
--- chrome/browser/ui/gtk/gtk_util.cc (revision 116109)
+++ chrome/browser/ui/gtk/gtk_util.cc (working copy)
@@ -56,6 +56,8 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
+using content::WebContents;
+
namespace {
#if defined(GOOGLE_CHROME_BUILD)
@@ -159,10 +161,10 @@
#if defined(OS_CHROMEOS)
-TabContents* GetBrowserWindowSelectedTabContents(BrowserWindow* window) {
+WebContents* GetBrowserWindowSelectedWebContents(BrowserWindow* window) {
chromeos::BrowserView* browser_view = static_cast<chromeos::BrowserView*>(
window);
- return browser_view->GetSelectedTabContents();
+ return browser_view->GetSelectedWebContents();
}
GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
@@ -179,10 +181,10 @@
#else
-TabContents* GetBrowserWindowSelectedTabContents(BrowserWindow* window) {
+WebContents* GetBrowserWindowSelectedWebContents(BrowserWindow* window) {
BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>(
window);
- return browser_window->browser()->GetSelectedTabContents();
+ return browser_window->browser()->GetSelectedWebContents();
}
GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
@@ -1172,7 +1174,7 @@
if (widget == NULL)
return; // Do nothing if no focused widget.
- TabContents* current_tab = GetBrowserWindowSelectedTabContents(window);
+ WebContents* current_tab = GetBrowserWindowSelectedWebContents(window);
if (current_tab && widget == current_tab->GetContentNativeView()) {
(current_tab->GetRenderViewHost()->*method)();
} else {
« no previous file with comments | « chrome/browser/ui/gtk/browser_window_gtk.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