| OLD | NEW |
| 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 focus_store_.Store(GetNativeView()); | 240 focus_store_.Store(GetNativeView()); |
| 241 } | 241 } |
| 242 | 242 |
| 243 void TabContentsViewGtk::RestoreFocus() { | 243 void TabContentsViewGtk::RestoreFocus() { |
| 244 if (focus_store_.widget()) | 244 if (focus_store_.widget()) |
| 245 gtk_widget_grab_focus(focus_store_.widget()); | 245 gtk_widget_grab_focus(focus_store_.widget()); |
| 246 else | 246 else |
| 247 SetInitialFocus(); | 247 SetInitialFocus(); |
| 248 } | 248 } |
| 249 | 249 |
| 250 void TabContentsViewGtk::UpdatePreferredSize(const gfx::Size& pref_size) { | |
| 251 } | |
| 252 | |
| 253 bool TabContentsViewGtk::IsDoingDrag() const { | 250 bool TabContentsViewGtk::IsDoingDrag() const { |
| 254 return false; | 251 return false; |
| 255 } | 252 } |
| 256 | 253 |
| 257 void TabContentsViewGtk::CancelDragAndCloseTab() { | 254 void TabContentsViewGtk::CancelDragAndCloseTab() { |
| 258 } | 255 } |
| 259 | 256 |
| 260 bool TabContentsViewGtk::IsEventTracking() const { | 257 bool TabContentsViewGtk::IsEventTracking() const { |
| 261 return false; | 258 return false; |
| 262 } | 259 } |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 498 g_value_set_int(&value, child_x); | 495 g_value_set_int(&value, child_x); |
| 499 gtk_container_child_set_property(GTK_CONTAINER(floating_container), | 496 gtk_container_child_set_property(GTK_CONTAINER(floating_container), |
| 500 widget, "x", &value); | 497 widget, "x", &value); |
| 501 | 498 |
| 502 int child_y = std::max((allocation->height - requisition.height) / 2, 0); | 499 int child_y = std::max((allocation->height - requisition.height) / 2, 0); |
| 503 g_value_set_int(&value, child_y); | 500 g_value_set_int(&value, child_y); |
| 504 gtk_container_child_set_property(GTK_CONTAINER(floating_container), | 501 gtk_container_child_set_property(GTK_CONTAINER(floating_container), |
| 505 widget, "y", &value); | 502 widget, "y", &value); |
| 506 g_value_unset(&value); | 503 g_value_unset(&value); |
| 507 } | 504 } |
| OLD | NEW |