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)

[Miranda Callahan, 2011/11/11 15:26:24]

This shouldn't be included for OS_MAC, either.

[msw, 2011/11/11 19:05:25]

I don't think we typically need to explicitly exclude OS_MAC from views files,
do we?

[Miranda Callahan, 2011/11/11 20:04:46]

Oh, good point -- we're already in /views, so we don't need to bother.

[alicet1, 2011/11/12 00:03:51]

I think the mac branch is under
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/ui/cocoa/locat...

and not using this file so leave OS_MAC out here is fine.

+#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 908 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);
+#if !defined(OS_CHROMEOS)
+  // First run bubble doesn't make sense for Chrome OS.
+  // Point at the base of the omnibox icon. location_icon_view_ height
+  // already includes padding, we want the tip of the bubble to be closer
+  // to the height the bitmap instead.

[Miranda Callahan, 2011/11/11 15:26:24]

s/height the/height of the/

[alicet1, 2011/11/12 00:03:51]

Done.

+  const int kXOffset = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      IDR_OMNIBOX_HTTP)->width() / 2;
+  const int icon_height = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      IDR_OMNIBOX_HTTP)->height();
+  const int kYOffset =  (location_icon_view_->height() + icon_height) / 2;
+  gfx::Point origin(location_icon_view_->bounds().x() + kXOffset,
+                    location_icon_view_->bounds().y() + kYOffset);
   // 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(),

[Miranda Callahan, 2011/11/11 15:26:24]

if you're going to have the args each on one line (which I like), please move
GetWidget() down as well.

[alicet1, 2011/11/12 00:03:51]

Done.

                        gfx::Rect(origin, gfx::Size()),
-                       views::BubbleBorder::TOP_LEFT, bubble_type);
+                       views::BubbleBorder::TOP_LEFT,
+                       bubble_type);
 #endif
 }
 
 std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& event) {
 #if defined(OS_WIN)
@@ skipping 223 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