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

Side by Side Diff: chrome/browser/ui/gtk/tab_contents_container_gtk.cc

Issue 7740003: content: Move gtk_expanded_container to ui/base/gtk/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and retry failing windows compile Created 9 years, 3 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
« no previous file with comments | « chrome/browser/ui/gtk/slide_animator_gtk.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ui/gtk/tab_contents_container_gtk.h" 5 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "chrome/browser/ui/gtk/gtk_expanded_container.h"
11 #include "chrome/browser/ui/gtk/status_bubble_gtk.h" 10 #include "chrome/browser/ui/gtk/status_bubble_gtk.h"
12 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 11 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
13 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" 12 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
14 #include "content/browser/tab_contents/tab_contents.h" 13 #include "content/browser/tab_contents/tab_contents.h"
15 #include "content/common/notification_source.h" 14 #include "content/common/notification_source.h"
15 #include "ui/base/gtk/gtk_expanded_container.h"
16 #include "ui/base/gtk/gtk_floating_container.h" 16 #include "ui/base/gtk/gtk_floating_container.h"
17 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
18 18
19 TabContentsContainerGtk::TabContentsContainerGtk(StatusBubbleGtk* status_bubble) 19 TabContentsContainerGtk::TabContentsContainerGtk(StatusBubbleGtk* status_bubble)
20 : tab_(NULL), 20 : tab_(NULL),
21 preview_(NULL), 21 preview_(NULL),
22 status_bubble_(status_bubble) { 22 status_bubble_(status_bubble) {
23 Init(); 23 Init();
24 } 24 }
25 25
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 g_value_set_int(&value, allocation->width - requisition.width); 236 g_value_set_int(&value, allocation->width - requisition.width);
237 gtk_container_child_set_property(GTK_CONTAINER(floating_container), 237 gtk_container_child_set_property(GTK_CONTAINER(floating_container),
238 status->widget(), "x", &value); 238 status->widget(), "x", &value);
239 239
240 int child_y = std::max(allocation->height - requisition.height, 0); 240 int child_y = std::max(allocation->height - requisition.height, 0);
241 g_value_set_int(&value, child_y + status->y_offset()); 241 g_value_set_int(&value, child_y + status->y_offset());
242 gtk_container_child_set_property(GTK_CONTAINER(floating_container), 242 gtk_container_child_set_property(GTK_CONTAINER(floating_container),
243 status->widget(), "y", &value); 243 status->widget(), "y", &value);
244 g_value_unset(&value); 244 g_value_unset(&value);
245 } 245 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/slide_animator_gtk.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698