Restyle omnibox popup

chrome/browser/ui/views/toolbar_view.cc

 // Copyright 2012 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/ui/views/toolbar_view.h"
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
@@ skipping 362 matching lines @@
 
 WebContents* ToolbarView::GetWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 InstantController* ToolbarView::GetInstant() {
   return browser_->instant_controller() ?
       browser_->instant_controller()->instant() : NULL;
 }
 
+void ToolbarView::GetOmniboxPopupPositioningInfo(

[Peter Kasting, 2013/06/06 18:52:16]

It seems like LocationBarView could implement this function directly; every
place we use |this| it could simply use its parent view.  It doesn't even need
to know that that's a ToolbarView.

[Peter Kasting, 2013/06/06 21:01:11]

You didn't do this.

+    gfx::Point* top_left_screen_coord,
+    int* popup_width,
+    int* left_margin,
+    int* right_margin) {
+  gfx::Rect location_bar_bounds(location_bar_->GetContentsBounds());
+  const views::Border* border = location_bar_->border();
+  if (border) {

[Peter Kasting, 2013/06/06 18:52:16]

When is this true?

[brettw, 2013/06/06 20:46:49]

I have no idea. This code is just moved from
OmniboxPopupContentsView::CalculateTargetBounds

[Peter Kasting, 2013/06/06 21:01:11]

I tracked this down.  This was added for the app launcher code that no longer
exists.  Just nuke this.

+    // Adjust for the border so that the bubble and location bar borders are
+    // aligned.
+    gfx::Insets insets = border->GetInsets();
+    location_bar_bounds.Inset(insets.left(), 0, insets.right(), 0);
+  } else {
+    // The normal location bar is drawn using a background graphic that includes
+    // the border, so we inset by enough to make the edges line up, and the
+    // bubble appear at the same height as the Star bubble.
+    location_bar_bounds.Inset(LocationBarView::kNormalHorizontalEdgeThickness,

[Peter Kasting, 2013/06/06 18:52:16]

Note: You'll need to update this for recent changes in the LocationBarView.  (I
think you just need to use kNormalEdgeThickness.)

+                              0);
+  }
+
+  *top_left_screen_coord = gfx::Point(0, height());
+  views::View::ConvertPointToScreen(this, top_left_screen_coord);
+  *popup_width = width();
+
+  gfx::Point location_bar_in_toolbar(location_bar_bounds.origin());
+  views::View::ConvertPointToTarget(location_bar_, this,
+                                    &location_bar_in_toolbar);
+  *left_margin = location_bar_in_toolbar.x();
+  *right_margin = *popup_width - *left_margin - location_bar_bounds.width();
+}
+
 ContentSettingBubbleModelDelegate*
 ToolbarView::GetContentSettingBubbleModelDelegate() {
   return browser_->content_setting_bubble_model_delegate();
 }
 
 void ToolbarView::ShowWebsiteSettings(content::WebContents* web_contents,
                                       const GURL& url,
                                       const content::SSLStatus& ssl,
                                       bool show_history) {
   chrome::ShowWebsiteSettings(browser_, web_contents, url, ssl, show_history);
@@ skipping 416 matching lines @@
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }