Fifth patch in getting rid of caching MessageLoop pointers.

chrome/browser/browser_init.cc

 // Copyright (c) 2009 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/browser_init.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/event_recorder.h"
 #include "base/path_service.h"
 #include "base/sys_info.h"
-#include "base/thread.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/shell_integration.h"
@@ skipping 140 matching lines @@
       return;
     tab->AddInfoBar(new DefaultBrowserInfoBarDelegate(tab));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NotifyNotDefaultBrowserTask);
 };
 
 class CheckDefaultBrowserTask : public Task {
  public:
-  explicit CheckDefaultBrowserTask(MessageLoop* ui_loop) : ui_loop_(ui_loop) {
+  CheckDefaultBrowserTask() {
   }
 
   virtual void Run() {
-    if (!ShellIntegration::IsDefaultBrowser())
-      ui_loop_->PostTask(FROM_HERE, new NotifyNotDefaultBrowserTask());
+    if (ShellIntegration::IsDefaultBrowser())
+      return;
+
+    ChromeThread::PostTask(
+        ChromeThread::UI, FROM_HERE, new NotifyNotDefaultBrowserTask());
   }
 
  private:
-  MessageLoop* ui_loop_;
 

[cpu_(ooo_6.6-7.5), 2009/11/03 02:16:24]

remove blank line?

[jam, 2009/11/03 03:52:47]

Done.

   DISALLOW_COPY_AND_ASSIGN(CheckDefaultBrowserTask);
 };
 
 // A delegate for the InfoBar shown when the previous session has crashed. The
 // bar deletes itself automatically after it is closed.
 // TODO(timsteele): This delegate can leak when a tab is closed, see
 // http://crbug.com/6520
 class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   explicit SessionCrashedInfoBarDelegate(TabContents* contents)
@@ skipping 469 matching lines @@
 }
 
 void BrowserInit::LaunchWithProfile::CheckDefaultBrowser(Profile* profile) {
   // We do not check if we are the default browser if:
   // - the user said "don't ask me again" on the infobar earlier.
   // - this is the first launch after the first run flow.
   if (!profile->GetPrefs()->GetBoolean(prefs::kCheckDefaultBrowser) ||
       FirstRun::IsChromeFirstRun()) {
     return;
   }
-  g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,
-      new CheckDefaultBrowserTask(MessageLoop::current()));
+  ChromeThread::PostTask(
+      ChromeThread::FILE, FROM_HERE, new CheckDefaultBrowserTask());
 }
 
 bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line,
                                      const std::wstring& cur_dir,
                                      bool process_startup,
                                      Profile* profile,
                                      int* return_code,
                                      BrowserInit* browser_init) {
   DCHECK(profile);
   if (process_startup) {
@@ skipping 143 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }