Rebase BookmarkBubble on the new views bubble.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 2011 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/location_bar/location_bar_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 38 matching lines @@
 #include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_util.h"
-#include "views/bubble/bubble_border.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/drag_utils.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/first_run_bubble.h"
 #include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
 #endif
 
 using views::View;
@@ skipping 328 matching lines @@
   }
   return NULL;
 }
 
 void LocationBarView::SetStarToggled(bool on) {
   if (star_view_)
     star_view_->SetToggled(on);
 }
 
 void LocationBarView::ShowStarBubble(const GURL& url, bool newly_bookmarked) {
-  gfx::Rect screen_bounds(star_view_->GetImageBounds());
   // Compensate for some built-in padding in the Star image.
-  screen_bounds.Inset(1, 1, 1, 2);
-  gfx::Point origin(screen_bounds.origin());
-  views::View::ConvertPointToScreen(star_view_, &origin);
-  screen_bounds.set_origin(origin);
-  browser::ShowBookmarkBubbleView(GetWidget(), screen_bounds, star_view_,
-                                  browser_->profile(), url, newly_bookmarked);
+  gfx::Point anchor(star_view_->width() / 2, star_view_->height() - 5);
+  views::View::ConvertPointToScreen(star_view_, &anchor);
+  browser::ShowBookmarkBubbleView(GetWidget(), anchor, browser_->profile(),
+                                  url, newly_bookmarked);
 }
 
 gfx::Point LocationBarView::GetLocationEntryOrigin() const {
   gfx::Point origin(location_entry_view_->bounds().origin());
   // If the UI layout is RTL, the coordinate system is not transformed and
   // therefore we need to adjust the X coordinate so that bubble appears on the
   // right hand side of the location bar.
   if (base::i18n::IsRTL())
     origin.set_x(width() - origin.x());
   views::View::ConvertPointToScreen(this, &origin);
@@ skipping 849 matching lines @@
       !suggested_text_view_->GetText().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif