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

Side by Side Diff: chrome/browser/ui/gtk/slide_animator_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, 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/ui/gtk/slide_animator_gtk.h" 5 #include "chrome/browser/ui/gtk/slide_animator_gtk.h"
6 6
7 #include "chrome/browser/ui/gtk/gtk_expanded_container.h"
8 #include "ui/base/animation/animation.h" 7 #include "ui/base/animation/animation.h"
9 #include "ui/base/animation/slide_animation.h" 8 #include "ui/base/animation/slide_animation.h"
9 #include "ui/base/gtk/gtk_expanded_container.h"
10 10
11 namespace { 11 namespace {
12 12
13 void OnChildSizeRequest(GtkWidget* expanded, 13 void OnChildSizeRequest(GtkWidget* expanded,
14 GtkWidget* child, 14 GtkWidget* child,
15 GtkRequisition* requisition, 15 GtkRequisition* requisition,
16 gpointer control_child_size) { 16 gpointer control_child_size) {
17 // If |control_child_size| is true, then we want |child_| to match the width 17 // If |control_child_size| is true, then we want |child_| to match the width
18 // of the |widget_|, but the height of |child_| should not change. 18 // of the |widget_|, but the height of |child_| should not change.
19 if (!GPOINTER_TO_INT(control_child_size)) { 19 if (!GPOINTER_TO_INT(control_child_size)) {
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // static 144 // static
145 void SlideAnimatorGtk::OnChildSizeAllocate(GtkWidget* child, 145 void SlideAnimatorGtk::OnChildSizeAllocate(GtkWidget* child,
146 GtkAllocation* allocation, 146 GtkAllocation* allocation,
147 SlideAnimatorGtk* slider) { 147 SlideAnimatorGtk* slider) {
148 if (slider->child_needs_move_) { 148 if (slider->child_needs_move_) {
149 gtk_expanded_container_move(GTK_EXPANDED_CONTAINER(slider->widget()), 149 gtk_expanded_container_move(GTK_EXPANDED_CONTAINER(slider->widget()),
150 child, 0, -allocation->height); 150 child, 0, -allocation->height);
151 slider->child_needs_move_ = false; 151 slider->child_needs_move_ = false;
152 } 152 }
153 } 153 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/infobars/infobar_gtk.cc ('k') | chrome/browser/ui/gtk/tab_contents_container_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698