Revert 53198 - Some first run fixes:...

chrome/browser/views/location_bar/location_bar_view.cc

 // Copyright (c) 2010 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/views/location_bar/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 81 matching lines @@
       delegate_(delegate),
       disposition_(CURRENT_TAB),
       location_icon_view_(NULL),
       ev_bubble_view_(NULL),
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
       keyword_hint_view_(NULL),
       star_view_(NULL),
       mode_(mode),
       show_focus_rect_(false),
-      bubble_type_(FirstRun::MINIMALBUBBLE) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(first_run_bubble_(this)) {
   DCHECK(profile_);
   SetID(VIEW_ID_LOCATION_BAR);
   SetFocusable(true);
 
   if (mode_ == NORMAL)
     painter_.reset(new views::HorizontalPainter(kNormalModeBackgroundImages));
 }
 
 LocationBarView::~LocationBarView() {
-  // This is in case we're destroyed before the model loads.  This is safe
-  // if we're not a registered observer.
-  if (profile_->GetTemplateURLModel())
-    profile_->GetTemplateURLModel()->RemoveObserver(this);
 }
 
 void LocationBarView::Init() {
   if (mode_ == POPUP) {
     font_ = ResourceBundle::GetSharedInstance().GetFont(
         ResourceBundle::BaseFont);
   } else {
     // Use a larger version of the system font.
     font_ = font_.DeriveFont(3);
   }
@@ skipping 817 matching lines @@
 bool LocationBarView::CanStartDrag(View* sender,
                                    const gfx::Point& press_pt,
                                    const gfx::Point& p) {
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, LocationBar implementation:
 
 void LocationBarView::ShowFirstRunBubble(FirstRun::BubbleType bubble_type) {
-  // Wait until search engines have loaded to show the first run bubble.
-  if (!profile_->GetTemplateURLModel()->loaded()) {
-    bubble_type_ = bubble_type;
-    profile_->GetTemplateURLModel()->AddObserver(this);
-    profile_->GetTemplateURLModel()->Load();
-    return;
-  }
-  ShowFirstRunBubbleInternal(bubble_type);
+  // We wait 30 milliseconds to open. It allows less flicker.
+  Task* task = first_run_bubble_.NewRunnableMethod(
+      &LocationBarView::ShowFirstRunBubbleInternal, bubble_type);
+  MessageLoop::current()->PostDelayedTask(FROM_HERE, task, 30);
 }
 
 std::wstring LocationBarView::GetInputString() const {
   return location_input_;
 }
 
 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const {
   return disposition_;
 }
 
@@ skipping 65 matching lines @@
         page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton,
             false);  // inspect_with_devtools
         return;
       }
       ++current;
     }
   }
 
   NOTREACHED();
 }
-
-void LocationBarView::OnTemplateURLModelChanged() {
-  if (profile_->GetTemplateURLModel())
-    profile_->GetTemplateURLModel()->RemoveObserver(this);
-  ShowFirstRunBubble(bubble_type_);
-}
-