Delay updating jumplist to avoid blocking the file thread at start-up

chrome/browser/jumplist_win.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/jumplist_win.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 19 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/icon_util.h"
 
 using content::BrowserThread;
@@ skipping 430 matching lines @@
     return false;
 
   return true;
 }
 
 }  // namespace
 
 JumpList::JumpList()
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       profile_(NULL),
-      task_id_(CancelableTaskTracker::kBadTaskId) {
+      task_id_(CancelableTaskTracker::kBadTaskId),
+      first_page_load_(true),
+      update_pending_(false) {
 }
 
 JumpList::~JumpList() {
   Terminate();
 }
 
 // static
 bool JumpList::Enabled() {
   return (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
           !CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 25 matching lines @@
     top_sites->SyncWithHistory();
     registrar_.reset(new content::NotificationRegistrar);
     // Register for notification when TopSites changes so that we can update
     // ourself.
     registrar_->Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
                     content::Source<history::TopSites>(top_sites));
     // Register for notification when profile is destroyed to ensure that all
     // observers are detatched at that time.
     registrar_->Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                     content::Source<Profile>(profile_));
+    // Register for notification of when
+    registrar_->Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
+                 content::NotificationService::AllSources());

[jeremy, 2012/12/12 08:16:09]

I think 'content::' should be aligned under 'this' .

[Cait (Slow), 2012/12/12 17:09:17]

Done.

   }
   tab_restore_service->AddObserver(this);
   return true;
 }
 
 void JumpList::Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_TOP_SITES_CHANGED: {
       // Most visited urls changed, query again.
       history::TopSites* top_sites = profile_->GetTopSites();
       if (top_sites) {
         top_sites->GetMostVisitedURLs(
             base::Bind(&JumpList::OnMostVisitedURLsAvailable,
                        weak_ptr_factory_.GetWeakPtr()));
       }
       break;
     }
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       // Profile was destroyed, do clean-up.
       Terminate();
       break;
     }
+    case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME: {
+      if (first_page_load_) {
+        first_page_load_ = false;
+        if (update_pending_) {
+          update_pending_ = false;
+          BrowserThread::PostTask(
+              BrowserThread::FILE, FROM_HERE,
+              base::Bind(&JumpList::RunUpdate, this));
+        }
+      }
+    }

[jeremy, 2012/12/12 08:16:09]

break ?

[Cait (Slow), 2012/12/12 17:09:17]

Done.

     default:
       NOTREACHED() << "Unexpected notification type.";
   }
 }
 
 void JumpList::RemoveObserver() {
   if (profile_) {
     TabRestoreService* tab_restore_service =
         TabRestoreServiceFactory::GetForProfile(profile_);
     if (tab_restore_service)
@@ skipping 117 matching lines @@
   }
 }
 
 void JumpList::StartLoadingFavicon() {
   GURL url;
   {
     base::AutoLock auto_lock(list_lock_);
     if (icon_urls_.empty()) {
       // No more favicons are needed by the application JumpList. Schedule a
       // RunUpdate call.
-      BrowserThread::PostTask(
-          BrowserThread::FILE, FROM_HERE,
-          base::Bind(&JumpList::RunUpdate, this));
+      if (first_page_load_) {
+        update_pending_ = true;
+      } else {
+        BrowserThread::PostTask(
+            BrowserThread::FILE, FROM_HERE,
+            base::Bind(&JumpList::RunUpdate, this));
+      }
       return;
     }
     // Ask FaviconService if it has a favicon of a URL.
     // When FaviconService has one, it will call OnFaviconDataAvailable().
     url = GURL(icon_urls_.front().first);
   }
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   task_id_ = favicon_service->GetFaviconImageForURL(
       FaviconService::FaviconForURLParams(profile_,
@@ skipping 67 matching lines @@
 }
 
 void JumpList::CreateIconFiles(const ShellLinkItemList& item_list) {
   for (ShellLinkItemList::const_iterator item = item_list.begin();
       item != item_list.end(); ++item) {
     FilePath icon_path;
     if (CreateIconFile((*item)->data(), icon_dir_, &icon_path))
       (*item)->SetIcon(icon_path.value(), 0, true);
   }
 }