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

trunk/src/chrome/browser/first_run/first_run.cc

 // 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/first_run/first_run.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #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"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/first_run/first_run_dialog.h"
 #include "chrome/browser/first_run/first_run_import_observer.h"
 #include "chrome/browser/first_run/first_run_internal.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/importer/importer_progress_dialog.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #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"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/startup_metric_utils.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "googleurl/src/gurl.h"
 
 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;
 
 // Flags indicating whether a first-run profile auto import was performed, and
 // whether the importer process exited successfully.
 bool did_perform_profile_import = false;
 bool profile_import_exited_successfully = false;
 
 // Helper class that performs delayed first-run tasks that need more of the
@@ skipping 431 matching lines @@
   return *GetExtraArgumentsInstance();
 }
 
 // static
 void FirstRunBubbleLauncher::ShowFirstRunBubbleSoon() {
   SetShowFirstRunBubblePref(FIRST_RUN_BUBBLE_SHOW);
   // This FirstRunBubbleLauncher instance will manage its own lifetime.
   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,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME);
   Browser* browser = chrome::FindBrowserWithWebContents(
       content::Source<content::WebContents>(source).ptr());
   if (!browser || !browser->is_type_tabbed())
     return;
@@ skipping 45 matching lines @@
         return;
     }
   }
 
   // Suppress the first run bubble if a global error bubble is pending.
   GlobalErrorService* global_error_service =
       GlobalErrorServiceFactory::GetForProfile(browser->profile());
   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;
 }
 
 void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs) {
   internal::master_prefs_path_for_testing.Get() = master_prefs;
 }
 
 ProcessMasterPreferencesResult ProcessMasterPreferences(
     const base::FilePath& user_data_dir,
     MasterPrefs* out_prefs) {
@@ skipping 158 matching lines @@
   internal::DoPostImportPlatformSpecificTasks();
 }
 
 bool DidPerformProfileImport(bool* exited_successfully) {
   if (exited_successfully)
     *exited_successfully = profile_import_exited_successfully;
   return did_perform_profile_import;
 }
 
 }  // namespace first_run