first run bubble using the views/bubble api.

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 43 matching lines @@
 #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_CHROMEOS)
+#include "chrome/browser/ui/views/first_run_bubble.h"
+#endif
+
 #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;
 
 namespace {
 
 TabContents* GetTabContentsFromDelegate(LocationBarView::Delegate* delegate) {
   const TabContentsWrapper* wrapper = delegate->GetTabContentsWrapper();
   return wrapper ? wrapper->tab_contents() : NULL;
@@ skipping 322 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) {
+  ShowFirstRunBubble(FirstRun::OEM_BUBBLE);
+#ifdef NEVER
   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);
+#endif
 }
 
 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 589 matching lines @@
   ConvertPointToScreen(this, &screen_point);
   if (views::Widget::IsPureViews())
     NOTIMPLEMENTED();
   else
     GetOmniboxViewWin()->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
 }
 #endif
 
 void LocationBarView::ShowFirstRunBubbleInternal(
     FirstRun::BubbleType bubble_type) {
-#if defined(OS_WIN)  // First run bubble doesn't make sense for Chrome OS.
-  // Point at the start of the edit control; adjust to look as good as possible.
-  const int kXOffset = kNormalHorizontalEdgeThickness + kEdgeItemPadding +
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(
-      IDR_OMNIBOX_HTTP)->width() + kItemPadding;
-  const int kYOffset = -(kVerticalEdgeThickness + 2);
-  gfx::Point origin(location_entry_view_->bounds().x() + kXOffset,
-                    y() + height() + kYOffset);
+  // TODO(alicet): clean up all |bubble_type| reference in the codebase.
+#if !defined(OS_CHROMEOS)
+  // First run bubble doesn't make sense for Chrome OS.
+  // Point at the omnibox icon.
+  //  int location_y = kVerticalEdgeThickness;

[Miranda Callahan, 2011/11/02 15:36:14]

remove commented-out code.

[alicet1, 2011/11/03 18:21:51]

Done.

+  int location_height = std::max(height() - (kVerticalEdgeThickness * 2), 0);
+  //  const int kYOffset = -(kVerticalEdgeThickness * 2);

[Miranda Callahan, 2011/11/02 15:36:14]

same as above.

[alicet1, 2011/11/03 18:21:51]

Done.

+  const int kXOffset =  ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      IDR_OMNIBOX_HTTP)->width() / 2;
+  gfx::Point origin(location_icon_view_->bounds().x() + kXOffset,
+                    location_height - 1);
   // 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);
   FirstRunBubble::Show(browser_->profile(), GetWidget(),
                        gfx::Rect(origin, gfx::Size()),
-                       views::BubbleBorder::TOP_LEFT, bubble_type);
+                       views::BubbleBorder::TOP_LEFT);
 #endif
 }
 
 std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& event) {
 #if defined(OS_WIN)
@@ skipping 224 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