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

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 7973003: Making TOOLKIT_USES_GTK orthogonal to USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 3 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/profiles/profile.cc ('k') | chrome/browser/renderer_preferences_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index 7b35392287959ff50f06e6513d7d73d73757219f..8808c4ae547b4aea2d5ea603e61fd0b7f25e3c16 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -777,7 +777,7 @@ void RenderWidgetHostViewViews::OnPaint(gfx::Canvas* canvas) {
paint_rect = paint_rect.Intersect(invalid_rect_);
if (backing_store) {
-#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
+#if defined(TOOLKIT_USES_GTK)
// Only render the widget if it is attached to a window; there's a short
// period where this object isn't attached to a window but hasn't been
// Destroy()ed yet and it receives paint messages...
@@ -797,7 +797,7 @@ void RenderWidgetHostViewViews::OnPaint(gfx::Canvas* canvas) {
// TODO(sad)
NOTIMPLEMENTED();
}
-#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
+#if defined(TOOLKIT_USES_GTK)
}
#endif
if (!whiteout_start_time_.is_null()) {
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/renderer_preferences_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698