summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/browser_window_gtk.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index ca3509f..43cfae6 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -278,6 +278,7 @@ BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
maximize_after_show_(false),
suppress_window_raise_(false),
accel_group_(NULL),
+ debounce_timer_disabled_(false),
infobar_arrow_model_(this) {
}
@@ -1327,10 +1328,11 @@ gboolean BrowserWindowGtk::OnConfigure(GtkWidget* widget,
// reconfigure event in a short while.
// We don't use Reset() because the timer may not yet be running.
// (In that case Stop() is a no-op.)
- window_configure_debounce_timer_.Stop();
- window_configure_debounce_timer_.Start(base::TimeDelta::FromMilliseconds(
- kDebounceTimeoutMilliseconds), this,
- &BrowserWindowGtk::OnDebouncedBoundsChanged);
+ if (!debounce_timer_disabled_)
+ window_configure_debounce_timer_.Stop();
+ window_configure_debounce_timer_.Start(base::TimeDelta::FromMilliseconds(
+ kDebounceTimeoutMilliseconds), this,
+ &BrowserWindowGtk::OnDebouncedBoundsChanged);
return FALSE;
}
@@ -1448,6 +1450,12 @@ bool BrowserWindowGtk::ShouldShowWindowIcon() const {
return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
}
+void BrowserWindowGtk::DisableDebounceTimerForTests(bool is_disabled) {
+ debounce_timer_disabled_ = is_disabled;
+ if (is_disabled)
+ window_configure_debounce_timer_.Stop();
+}
+
void BrowserWindowGtk::AddFindBar(FindBarGtk* findbar) {
gtk_floating_container_add_floating(
GTK_FLOATING_CONTAINER(render_area_floating_container_),