Revert 193513 "Add a short delay before showing the first run bu..."

> Add a short delay before showing the first run bubble.
> 
> R=grt@chromium.org
> BUG=223939
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/13958003

TBR=macourteau@chromium.org

Review URL: https://codereview.chromium.org/14362030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195176 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/first_run/first_run.cc

@@ -10,12 +10,10 @@
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
-#include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
-#include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ -40,7 +38,6 @@
 #include "chrome/browser/signin/signin_tracker.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -67,9 +64,6 @@ using content::UserMetricsAction;
 
 namespace {
 
-// How long to delay showing the first run bubble (in milliseconds).
-const int kFirstRunBubbleDelayMs = 200;
-
 // Flags for functions of similar name.
 bool should_show_welcome_page_ = false;
 bool should_do_autofill_personal_data_manager_first_run_ = false;
@@ -521,16 +515,12 @@ void FirstRunBubbleLauncher::ShowFirstRunBubbleSoon() {
   new FirstRunBubbleLauncher();
 }
 
-FirstRunBubbleLauncher::FirstRunBubbleLauncher()
-    : browser_(NULL) {
-  BrowserList::AddObserver(this);
+FirstRunBubbleLauncher::FirstRunBubbleLauncher() {
   registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                  content::NotificationService::AllSources());
 }
 
-FirstRunBubbleLauncher::~FirstRunBubbleLauncher() {
-  BrowserList::RemoveObserver(this);
-}
+FirstRunBubbleLauncher::~FirstRunBubbleLauncher() {}
 
 void FirstRunBubbleLauncher::Observe(
     int type,
@@ -596,37 +586,12 @@ void FirstRunBubbleLauncher::Observe(
   if (global_error_service->GetFirstGlobalErrorWithBubbleView() != NULL)
     return;
 
-  // Make sure we don't get notified again after resetting the
-  // kShowFirstRunBubbleOption preference below.
-  registrar_.Remove(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
-                    content::NotificationService::AllSources());
-
   // Reset the preference and notifications to avoid showing the bubble again.
   prefs->SetInteger(prefs::kShowFirstRunBubbleOption,
                     FIRST_RUN_BUBBLE_DONT_SHOW);
 
-  // Show the bubble soon.
-  browser_ = browser;
-  base::MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(
-          &FirstRunBubbleLauncher::DoShowFirstRunBubble,
-          AsWeakPtr()),
-      base::TimeDelta::FromMilliseconds(kFirstRunBubbleDelayMs));
-}
-
-void FirstRunBubbleLauncher::OnBrowserRemoved(Browser* browser) {
-  if (browser_ == browser) {
-    // Destroy this bubble launcher.
-    delete this;
-  }
-}
-
-void FirstRunBubbleLauncher::DoShowFirstRunBubble() {
-  DCHECK(browser_);
-
   // Show the bubble now and destroy this bubble launcher.
-  browser_->ShowFirstRunBubble();
+  browser->ShowFirstRunBubble();
   delete this;
 }
 

chrome/browser/first_run/first_run.h

@@ -12,13 +12,10 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ui/browser_list_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/native_widget_types.h"
 
-class Browser;
 class CommandLine;
 class GURL;
 class PrefRegistrySyncable;
@@ -187,10 +184,7 @@ ProcessMasterPreferencesResult ProcessMasterPreferences(
 
 // Show the first run search engine bubble at the first appropriate opportunity.
 // This bubble may be delayed by other UI, like global errors and sync promos.
-class FirstRunBubbleLauncher
-    : public content::NotificationObserver,
-      public chrome::BrowserListObserver,
-      public base::SupportsWeakPtr<FirstRunBubbleLauncher> {
+class FirstRunBubbleLauncher : public content::NotificationObserver {
  public:
   // Show the bubble at the first appropriate opportunity. This function
   // instantiates a FirstRunBubbleLauncher, which manages its own lifetime.
@@ -205,13 +199,7 @@ class FirstRunBubbleLauncher
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // chrome::BrowserListObserver override:
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
-
-  void DoShowFirstRunBubble();
-
   content::NotificationRegistrar registrar_;
-  Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher);
 };