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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 25 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
26 #include "chrome/browser/ui/gtk/constrained_window_gtk.h" 26 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
27 #include "chrome/browser/ui/gtk/gtk_expanded_container.h" 27 #include "chrome/browser/ui/gtk/gtk_expanded_container.h"
28 #include "chrome/browser/ui/gtk/gtk_floating_container.h" 28 #include "chrome/browser/ui/gtk/gtk_floating_container.h"
29 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 29 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
30 #include "chrome/browser/ui/gtk/gtk_util.h" 30 #include "chrome/browser/ui/gtk/gtk_util.h"
31 #include "chrome/browser/ui/gtk/sad_tab_gtk.h" 31 #include "chrome/browser/ui/gtk/sad_tab_gtk.h"
32 #include "chrome/browser/ui/gtk/tab_contents_drag_source.h" 32 #include "chrome/browser/ui/gtk/tab_contents_drag_source.h"
33 #include "chrome/common/notification_source.h" 33 #include "chrome/common/notification_source.h"
34 #include "chrome/common/notification_type.h" 34 #include "chrome/common/notification_type.h"
35 #include "gfx/point.h" 35 #include "ui/gfx/point.h"
36 #include "gfx/rect.h" 36 #include "ui/gfx/rect.h"
37 #include "gfx/size.h" 37 #include "ui/gfx/size.h"
38 #include "webkit/glue/webdropdata.h" 38 #include "webkit/glue/webdropdata.h"
39 39
40 using WebKit::WebDragOperation; 40 using WebKit::WebDragOperation;
41 using WebKit::WebDragOperationsMask; 41 using WebKit::WebDragOperationsMask;
42 42
43 namespace { 43 namespace {
44 44
45 // Called when the mouse leaves the widget. We notify our delegate. 45 // Called when the mouse leaves the widget. We notify our delegate.
46 gboolean OnLeaveNotify(GtkWidget* widget, GdkEventCrossing* event, 46 gboolean OnLeaveNotify(GtkWidget* widget, GdkEventCrossing* event,
47 TabContents* tab_contents) { 47 TabContents* tab_contents) {
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 g_value_set_int(&value, child_x); 427 g_value_set_int(&value, child_x);
428 gtk_container_child_set_property(GTK_CONTAINER(floating_container), 428 gtk_container_child_set_property(GTK_CONTAINER(floating_container),
429 widget, "x", &value); 429 widget, "x", &value);
430 430
431 int child_y = std::max((allocation->height - requisition.height) / 2, 0); 431 int child_y = std::max((allocation->height - requisition.height) / 2, 0);
432 g_value_set_int(&value, child_y); 432 g_value_set_int(&value, child_y);
433 gtk_container_child_set_property(GTK_CONTAINER(floating_container), 433 gtk_container_child_set_property(GTK_CONTAINER(floating_container),
434 widget, "y", &value); 434 widget, "y", &value);
435 g_value_unset(&value); 435 g_value_unset(&value);
436 } 436 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents_view.h ('k') | chrome/browser/tab_contents/tab_contents_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698