Get window origin only once in BrowserToolbarGtk::GetPopupBounds.

chrome/browser/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/gtk_dnd_util.h"
@@ skipping 413 matching lines @@
   GtkWidget* left;
   GtkWidget* right;
   if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
     left = go_->widget();
     right = star_->widget();
   } else {
     left = star_->widget();
     right = go_->widget();
   }
 
-  // TODO(deanm): The go and star buttons probably share the same window,
-  // so this could be optimized to only one origin request.
-  gint right_x;
-  gdk_window_get_origin(right->window, &right_x, NULL);
-  right_x += right->allocation.x + right->allocation.width;
+  gint origin_x, origin_y;
+  DCHECK_EQ(left->window, right->window);
+  gdk_window_get_origin(left->window, &origin_x, &origin_y);
 
-  gint left_x, left_y;
-  gdk_window_get_origin(left->window, &left_x, &left_y);
-  left_x += left->allocation.x;
-  left_y += left->allocation.y + left->allocation.height;  // Bottom edge.
+  gint right_x = origin_x + right->allocation.x + right->allocation.width;
+
+  gint left_x = origin_x + left->allocation.x;
+
+  // Bottom edge.
+  gint left_y = origin_y + left->allocation.y + left->allocation.height;
+
+  DCHECK_LE(left_x, right_x);
 
   return gfx::Rect(left_x + kPopupLeftRightMargin, left_y + kPopupTopMargin,
                    right_x - left_x - (2 * kPopupLeftRightMargin), 0);
 }
 
 // BrowserToolbarGtk, private --------------------------------------------------
 
 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
     int normal_id, int active_id, int highlight_id, int depressed_id,
     const std::string& localized_tooltip, const char* stock_id) {
@@ skipping 239 matching lines @@
   menu->PopupAsFromKeyEvent(button);
   menu_bar_helper_.MenuStartedShowing(button, menu->widget());
 }
 
 void BrowserToolbarGtk::PopupForButtonNextTo(GtkWidget* button,
                                              GtkMenuDirectionType dir) {
   GtkWidget* other_button = button == page_menu_button_.get() ?
       app_menu_button_.get() : page_menu_button_.get();
   PopupForButton(other_button);
 }