diff options
Diffstat (limited to 'chrome/browser/gtk')
-rwxr-xr-x | chrome/browser/gtk/tabs/tab_strip_gtk.cc | 13 | ||||
-rw-r--r-- | chrome/browser/gtk/tabs/tab_strip_gtk.h | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index b6b71d9..36d2c0e 100755 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -544,8 +544,7 @@ void TabStripGtk::Layout() { LayoutNewTabButton(static_cast<double>(tab_right), current_unselected_width_); #if defined(OS_CHROMEOS) - gtk_fixed_move(GTK_FIXED(tabstrip_.get()), tab_overview_button_->widget(), - bounds_.width() - tab_overview_button_->width(), 0); + LayoutTabOverviewButton(); #endif gtk_widget_queue_draw(tabstrip_.get()); } @@ -1000,6 +999,13 @@ void TabStripGtk::LayoutNewTabButton(double last_tab_right, bounds.x(), bounds.y()); } +#if defined OS_CHROMEOS +void TabStripGtk::LayoutTabOverviewButton() { + gtk_fixed_move(GTK_FIXED(tabstrip_.get()), tab_overview_button_->widget(), + bounds_.width() - tab_overview_button_->width(), 0); +} +#endif + void TabStripGtk::GetDesiredTabWidths(int tab_count, double* unselected_width, double* selected_width) const { @@ -1373,6 +1379,9 @@ void TabStripGtk::AnimationLayout(double unselected_width) { tab_x = end_of_tab + kTabHOffset; } LayoutNewTabButton(tab_x, unselected_width); +#if defined(OS_CHROMEOS) + LayoutTabOverviewButton(); +#endif gtk_widget_queue_draw(tabstrip_.get()); } diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.h b/chrome/browser/gtk/tabs/tab_strip_gtk.h index 1add69e..0da33f9 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.h +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.h @@ -288,6 +288,11 @@ class TabStripGtk : public TabStripModelObserver, // during animations, so we can't use current_unselected_width_. void LayoutNewTabButton(double last_tab_right, double unselected_width); +#if defined(OS_CHROMEOS) + // Positions the tab overview button. + void LayoutTabOverviewButton(); +#endif + // -- Link Drag & Drop ------------------------------------------------------ // Returns the bounds to render the drop at, in screen coordinates. Sets |