| OLD | NEW | 
|---|
| 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 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1267   GdkWindow* gdk_window = gtk_widget_get_window(view_.get()); | 1267   GdkWindow* gdk_window = gtk_widget_get_window(view_.get()); | 
| 1268   if (!gdk_window) { | 1268   if (!gdk_window) { | 
| 1269     GdkDisplay* display = gdk_display_get_default(); | 1269     GdkDisplay* display = gdk_display_get_default(); | 
| 1270     gdk_window = gdk_display_get_default_group(display); | 1270     gdk_window = gdk_display_get_default_group(display); | 
| 1271   } | 1271   } | 
| 1272   if (!gdk_window) | 1272   if (!gdk_window) | 
| 1273     return; | 1273     return; | 
| 1274   content::GetScreenInfoFromNativeWindow(gdk_window, results); | 1274   content::GetScreenInfoFromNativeWindow(gdk_window, results); | 
| 1275 } | 1275 } | 
| 1276 | 1276 | 
| 1277 gfx::Rect RenderWidgetHostViewGtk::GetRootWindowBounds() { | 1277 gfx::Rect RenderWidgetHostViewGtk::GetBoundsInRootWindow() { | 
| 1278   GtkWidget* toplevel = gtk_widget_get_toplevel(view_.get()); | 1278   GtkWidget* toplevel = gtk_widget_get_toplevel(view_.get()); | 
| 1279   if (!toplevel) | 1279   if (!toplevel) | 
| 1280     return gfx::Rect(); | 1280     return gfx::Rect(); | 
| 1281 | 1281 | 
| 1282   GdkRectangle frame_extents; | 1282   GdkRectangle frame_extents; | 
| 1283   GdkWindow* gdk_window = gtk_widget_get_window(toplevel); | 1283   GdkWindow* gdk_window = gtk_widget_get_window(toplevel); | 
| 1284   if (!gdk_window) | 1284   if (!gdk_window) | 
| 1285     return gfx::Rect(); | 1285     return gfx::Rect(); | 
| 1286 | 1286 | 
| 1287   gdk_window_get_frame_extents(gdk_window, &frame_extents); | 1287   gdk_window_get_frame_extents(gdk_window, &frame_extents); | 
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1547             parent, | 1547             parent, | 
| 1548             static_cast<content::AccessibilityNodeData::State>(0), | 1548             static_cast<content::AccessibilityNodeData::State>(0), | 
| 1549             this)); | 1549             this)); | 
| 1550   } | 1550   } | 
| 1551   BrowserAccessibilityGtk* root = | 1551   BrowserAccessibilityGtk* root = | 
| 1552       browser_accessibility_manager_->GetRoot()->ToBrowserAccessibilityGtk(); | 1552       browser_accessibility_manager_->GetRoot()->ToBrowserAccessibilityGtk(); | 
| 1553 | 1553 | 
| 1554   atk_object_set_role(root->GetAtkObject(), ATK_ROLE_HTML_CONTAINER); | 1554   atk_object_set_role(root->GetAtkObject(), ATK_ROLE_HTML_CONTAINER); | 
| 1555   return root->GetAtkObject(); | 1555   return root->GetAtkObject(); | 
| 1556 } | 1556 } | 
| OLD | NEW | 
|---|