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

Side by Side Diff: chrome/browser/tab_contents/tab_contents_view_gtk.cc

Issue 7669040: content: Move render_widget_host_view_gtk to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix. Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/tab_contents/tab_contents_view_gtk.h" 5 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <gdk/gdkkeysyms.h> 8 #include <gdk/gdkkeysyms.h>
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
11 #include <algorithm> 11 #include <algorithm>
12 12
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
17 #include "chrome/browser/tab_contents/render_view_context_menu_gtk.h" 16 #include "chrome/browser/tab_contents/render_view_context_menu_gtk.h"
18 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h" 17 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h"
19 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 18 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
20 #include "chrome/browser/ui/gtk/constrained_window_gtk.h" 19 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
21 #include "chrome/browser/ui/gtk/gtk_expanded_container.h" 20 #include "chrome/browser/ui/gtk/gtk_expanded_container.h"
22 #include "chrome/browser/ui/gtk/gtk_floating_container.h" 21 #include "chrome/browser/ui/gtk/gtk_floating_container.h"
23 #include "chrome/browser/ui/gtk/gtk_util.h" 22 #include "chrome/browser/ui/gtk/gtk_util.h"
24 #include "chrome/browser/ui/gtk/sad_tab_gtk.h" 23 #include "chrome/browser/ui/gtk/sad_tab_gtk.h"
25 #include "chrome/browser/ui/gtk/tab_contents_drag_source.h" 24 #include "chrome/browser/ui/gtk/tab_contents_drag_source.h"
26 #include "content/browser/renderer_host/render_process_host.h" 25 #include "content/browser/renderer_host/render_process_host.h"
27 #include "content/browser/renderer_host/render_view_host.h" 26 #include "content/browser/renderer_host/render_view_host.h"
28 #include "content/browser/renderer_host/render_view_host_factory.h" 27 #include "content/browser/renderer_host/render_view_host_factory.h"
28 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
29 #include "content/browser/tab_contents/interstitial_page.h" 29 #include "content/browser/tab_contents/interstitial_page.h"
30 #include "content/browser/tab_contents/tab_contents.h" 30 #include "content/browser/tab_contents/tab_contents.h"
31 #include "content/browser/tab_contents/tab_contents_delegate.h" 31 #include "content/browser/tab_contents/tab_contents_delegate.h"
32 #include "content/common/content_notification_types.h" 32 #include "content/common/content_notification_types.h"
33 #include "content/common/notification_source.h" 33 #include "content/common/notification_source.h"
34 #include "ui/gfx/point.h" 34 #include "ui/gfx/point.h"
35 #include "ui/gfx/rect.h" 35 #include "ui/gfx/rect.h"
36 #include "ui/gfx/size.h" 36 #include "ui/gfx/size.h"
37 #include "webkit/glue/webdropdata.h" 37 #include "webkit/glue/webdropdata.h"
38 38
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 g_value_set_int(&value, child_x); 504 g_value_set_int(&value, child_x);
505 gtk_container_child_set_property(GTK_CONTAINER(floating_container), 505 gtk_container_child_set_property(GTK_CONTAINER(floating_container),
506 widget, "x", &value); 506 widget, "x", &value);
507 507
508 int child_y = std::max((allocation->height - requisition.height) / 2, 0); 508 int child_y = std::max((allocation->height - requisition.height) / 2, 0);
509 g_value_set_int(&value, child_y); 509 g_value_set_int(&value, child_y);
510 gtk_container_child_set_property(GTK_CONTAINER(floating_container), 510 gtk_container_child_set_property(GTK_CONTAINER(floating_container),
511 widget, "y", &value); 511 widget, "y", &value);
512 g_value_unset(&value); 512 g_value_unset(&value);
513 } 513 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents_view_gtk.h ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698