Implement the new first run bubble, clean up old bubbles.

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

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 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/location_bar/location_bar_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
 #include <algorithm>
@@ skipping 118 matching lines @@
       ev_bubble_view_(NULL),
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
 #if defined(OS_WIN) || defined(USE_AURA)
       suggested_text_view_(NULL),
 #endif
       keyword_hint_view_(NULL),
       star_view_(NULL),
       mode_(mode),
       show_focus_rect_(false),
-      bubble_type_(FirstRun::MINIMAL_BUBBLE),
       template_url_service_(NULL),
       animation_offset_(0) {
   set_id(VIEW_ID_LOCATION_BAR);
 
   if (mode_ == NORMAL) {
     painter_.reset(
         views::Painter::CreateImagePainter(
             *ResourceBundle::GetSharedInstance().GetImageNamed(
                 IDR_LOCATION_BAR_BORDER).ToSkBitmap(),
             gfx::Insets(kBorderRoundCornerHeight, kBorderRoundCornerWidth,
@@ skipping 846 matching lines @@
   UINT flags = event.native_event().wParam;
   gfx::Point screen_point(event.location());
   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) {
+void LocationBarView::ShowFirstRunBubbleInternal() {
 #if !defined(OS_CHROMEOS)
   // First run bubble doesn't make sense for Chrome OS.
-  FirstRunBubble::ShowBubble(browser_->profile(),
-                             location_icon_view_,
-                             views::BubbleBorder::TOP_LEFT,
-                             bubble_type);
+  FirstRunBubble::ShowBubble(browser_->profile(), location_icon_view_);
 #endif
 }
 
 std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& event) {
 #if defined(OS_WIN)
@@ skipping 73 matching lines @@
 
 bool LocationBarView::CanStartDragForView(View* sender,
                                           const gfx::Point& press_pt,
                                           const gfx::Point& p) {
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, LocationBar implementation:
 
-void LocationBarView::ShowFirstRunBubble(FirstRun::BubbleType bubble_type) {
+void LocationBarView::ShowFirstRunBubble() {
   // Wait until search engines have loaded to show the first run bubble.
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(browser_->profile());
   if (!url_service->loaded()) {
-    bubble_type_ = bubble_type;
     template_url_service_ = url_service;
     template_url_service_->AddObserver(this);
     template_url_service_->Load();
     return;
   }
-  ShowFirstRunBubbleInternal(bubble_type);
+  ShowFirstRunBubbleInternal();
 }
 
 void LocationBarView::SetSuggestedText(const string16& text,
                                        InstantCompleteBehavior behavior) {
   location_entry_->model()->SetSuggestedText(text, behavior);
 }
 
 string16 LocationBarView::GetInputString() const {
   return location_input_;
 }
@@ skipping 93 matching lines @@
 
   NOTREACHED();
 }
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = NULL;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (location_entry_view_ && location_entry_view_->GetWidget()->IsActive())
-    ShowFirstRunBubble(bubble_type_);
+    ShowFirstRunBubble();
 }
 
 void LocationBarView::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* name = content::Details<std::string>(details).ptr();
     if (*name == prefs::kEditBookmarksEnabled)
       Update(NULL);
   }
 }
 
 #if defined(OS_WIN) || defined(USE_AURA)
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !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