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

trunk/src/chrome/browser/first_run/first_run.h

 // 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.
 
 #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #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;
 class Profile;
 class ProcessSingleton;
 
 namespace base {
 class FilePath;
 }
 
@@ skipping 148 matching lines @@
 // invoked only on first run.
 //
 // See chrome/installer/util/master_preferences.h for a description of
 // 'master_preferences' file.
 ProcessMasterPreferencesResult ProcessMasterPreferences(
     const base::FilePath& user_data_dir,
     MasterPrefs* out_prefs);
 
 // 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.
   static void ShowFirstRunBubbleSoon();
 
  private:
   FirstRunBubbleLauncher();
   virtual ~FirstRunBubbleLauncher();
 
   // content::NotificationObserver override:
   virtual void Observe(int type,
                        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);
 };
 
 }  // namespace first_run
 
 #endif  // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_