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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_gtk.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some new gfx::Screen additions Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" 5 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
6 6
7 // If this gets included after the gtk headers, then a bunch of compiler 7 // If this gets included after the gtk headers, then a bunch of compiler
8 // errors happen because of a "#define Status int" in Xlib.h, which interacts 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts
9 // badly with net::URLRequestStatus::Status. 9 // badly with net::URLRequestStatus::Status.
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 host_view->signals_.Connect(gtk_widget_get_toplevel(widget), 201 host_view->signals_.Connect(gtk_widget_get_toplevel(widget),
202 "configure-event", 202 "configure-event",
203 G_CALLBACK(OnConfigureEvent), host_view); 203 G_CALLBACK(OnConfigureEvent), host_view);
204 return FALSE; 204 return FALSE;
205 } 205 }
206 206
207 static gboolean OnConfigureEvent(GtkWidget* widget, 207 static gboolean OnConfigureEvent(GtkWidget* widget,
208 GdkEventConfigure* event, 208 GdkEventConfigure* event,
209 RenderWidgetHostViewGtk* host_view) { 209 RenderWidgetHostViewGtk* host_view) {
210 host_view->MarkCachedWidgetCenterStale(); 210 host_view->MarkCachedWidgetCenterStale();
211 host_view->UpdateScreenInfo(); 211 host_view->UpdateScreenInfo(host_view->GetNativeView());
212 return FALSE; 212 return FALSE;
213 } 213 }
214 214
215 static gboolean OnKeyPressReleaseEvent(GtkWidget* widget, 215 static gboolean OnKeyPressReleaseEvent(GtkWidget* widget,
216 GdkEventKey* event, 216 GdkEventKey* event,
217 RenderWidgetHostViewGtk* host_view) { 217 RenderWidgetHostViewGtk* host_view) {
218 TRACE_EVENT0("browser", 218 TRACE_EVENT0("browser",
219 "RenderWidgetHostViewGtkWidget::OnKeyPressReleaseEvent"); 219 "RenderWidgetHostViewGtkWidget::OnKeyPressReleaseEvent");
220 // Force popups or fullscreen windows to close on Escape so they won't keep 220 // Force popups or fullscreen windows to close on Escape so they won't keep
221 // the keyboard grabbed or be stuck onscreen if the renderer is hanging. 221 // the keyboard grabbed or be stuck onscreen if the renderer is hanging.
(...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 this)); 1551 this));
1552 } 1552 }
1553 BrowserAccessibilityGtk* root = 1553 BrowserAccessibilityGtk* root =
1554 browser_accessibility_manager_->GetRoot()->ToBrowserAccessibilityGtk(); 1554 browser_accessibility_manager_->GetRoot()->ToBrowserAccessibilityGtk();
1555 1555
1556 atk_object_set_role(root->GetAtkObject(), ATK_ROLE_HTML_CONTAINER); 1556 atk_object_set_role(root->GetAtkObject(), ATK_ROLE_HTML_CONTAINER);
1557 return root->GetAtkObject(); 1557 return root->GetAtkObject();
1558 } 1558 }
1559 1559
1560 } // namespace content 1560 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698