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

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

Issue 9705053: Remove tab_contents_view_gtk.h include from chrome. I tried to find a way to not have to expose the… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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/constrained_window_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/constrained_window_gtk.cc (revision 126737)
+++ chrome/browser/ui/gtk/constrained_window_gtk.cc (working copy)
@@ -14,6 +14,7 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
+#include "ui/base/gtk/focus_store_gtk.h"
#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/gtk/gtk_hig_constants.h"
@@ -22,7 +23,6 @@
#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
#else
#include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.h"
-#include "content/browser/tab_contents/tab_contents_view_gtk.h"
#endif
using content::BrowserThread;
@@ -126,8 +126,7 @@
// TODO(estade): this define should not need to be here because this class
// should not be used on linux/views.
#if defined(TOOLKIT_GTK)
- static_cast<content::TabContentsViewGtk*>(
- wrapper_->web_contents()->GetView())->SetFocusedWidget(focus_widget);
+ ContainingView()->focus_store()->SetWidget(focus_widget);
#endif
}
}
@@ -139,9 +138,7 @@
static_cast<TabContentsViewViews*>(wrapper_->web_contents()->GetView())->
native_tab_contents_view());
#else
- return static_cast<TabContentsViewType*>(
- static_cast<content::TabContentsViewGtk*>(
- wrapper_->web_contents()->GetView())->delegate());
+ return ChromeWebContentsViewDelegateGtk::GetFor(wrapper_->web_contents());
#endif
}
« no previous file with comments | « chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.cc ('k') | chrome/browser/ui/sad_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698