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

Unified Diff: chrome/browser/ui/panels/panel_gtk.cc

Issue 10914242: Improve panel tests by properly waiting for expected conditions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: undo changes to ActivateDeactivateBasic test Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_gtk.cc
diff --git a/chrome/browser/ui/panels/panel_gtk.cc b/chrome/browser/ui/panels/panel_gtk.cc
index b7455e4e507799d2eb6677772cbc865f19586d6d..e8da2c2962c0bc62ab4e8934e2b966ebb2131b5d 100644
--- a/chrome/browser/ui/panels/panel_gtk.cc
+++ b/chrome/browser/ui/panels/panel_gtk.cc
@@ -947,6 +947,11 @@ gfx::Size PanelGtk::ContentSizeFromWindowSize(
}
int PanelGtk::TitleOnlyHeight() const {
+ gfx::Size& frame_size = GetFrameSize();
+ if (!frame_size.IsEmpty())
+ return frame_size.height() - kFrameBorderThickness;
+
+ LOG(WARNING) << "Checking title height before window allocated";
jennb 2012/09/13 00:45:34 I intentionally left this log msg in to see if thi
Dmitry Titov 2012/09/13 18:19:00 Could you please move this note into a comment for
GtkAllocation allocation;
Dmitry Titov 2012/09/13 18:19:00 Do we actually need this code? It seems it should
jennb 2012/09/13 18:40:48 Changed to NOTREACHED using the log msg.
gtk_widget_get_allocation(titlebar_->widget(), &allocation);
return allocation.height;

Powered by Google App Engine
This is Rietveld 408576698