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

Unified Diff: chrome/browser/ui/gtk/slide_animator_gtk.cc

Issue 7549005: Abstract fullscreen exit bubble logic to bring Linux's behaviour in line with (Closed) Base URL: /usr/local/google/chromium2/src@trunk
Patch Set: Rebase attempt #3. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/slide_animator_gtk.cc
diff --git a/chrome/browser/ui/gtk/slide_animator_gtk.cc b/chrome/browser/ui/gtk/slide_animator_gtk.cc
index e18b748ec244c5b22ce418d7428673ed5c81d864..b8e7fdadceb14bd0731964ebd2608940697eeaf4 100644
--- a/chrome/browser/ui/gtk/slide_animator_gtk.cc
+++ b/chrome/browser/ui/gtk/slide_animator_gtk.cc
@@ -119,8 +119,10 @@ void SlideAnimatorGtk::AnimationProgressed(const ui::Animation* animation) {
int showing_height = static_cast<int>(req.height *
animation_->GetCurrentValue());
if (direction_ == DOWN) {
- gtk_expanded_container_move(GTK_EXPANDED_CONTAINER(widget_.get()),
- child_, 0, showing_height - req.height);
+ if (widget_.get()->parent) {
+ gtk_expanded_container_move(GTK_EXPANDED_CONTAINER(widget_.get()),
+ child_, 0, showing_height - req.height);
+ }
child_needs_move_ = false;
}
gtk_widget_set_size_request(widget_.get(), -1, showing_height);
« no previous file with comments | « chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698