Replace OnceOffCreateShortcuts with UpdateShortcutsForAllAppsIfNeeded.

chrome/browser/ui/app_list/app_list_service_impl.cc

 // Copyright 2013 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/ui/app_list/app_list_service_impl.h"
 
 #include <string>
 
 #include "apps/pref_names.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
-#include "chrome/browser/apps/shortcut_manager.h"
-#include "chrome/browser/apps/shortcut_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/profile_loader.h"
 #include "chrome/browser/ui/app_list/profile_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
@@ skipping 311 matching lines @@
   local_state_->SetInteger(prefs::kAppListEnableMethod, enable_source);
   if (base::MessageLoop::current()) {
     // Ensure a value is recorded if the user "never" shows the app list. Note
     // there is no message loop in unit tests.
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&RecordAppListDiscoverability,
                    base::Unretained(local_state_),
                    false),
         base::TimeDelta::FromMinutes(kDiscoverabilityTimeoutMinutes));
   }

[Matt Giuca, 2014/05/23 07:01:57]

Can you explain why this call to OnceOffCreateShortcuts
(UpdateShortcutsForAllAppsIfNeeded) was removed?

[jackhou1, 2014/05/26 07:57:37]

We don't need it any more since we've had app shortcuts enabled for ages. It was
previously here for people who enabled apps before we created shortcuts for
them. If you like, I can split these into two CLs, one removes the
OnceOffCreateShortcuts logic, another adds UpdateShortcutsForAllAppsIfNeeded.
The reason they're both in this CL is that they share a lot of code, so I
figured it's easier to move/rename than to delete then re-add.

[Matt Giuca, 2014/05/26 08:07:36]

Yeah would you be able to split it, if it's not too much effort?

[jackhou1, 2014/05/27 01:03:57]

As per discussion, keeping this CL has the benefit that it clearly shows the
overall change. In particular in shortcut_manager.cc, it's clear that
UpdateAllShortcutsIfNeeded replaces OnceOffCreateShortcuts, and int
kAppShortcutsVersion replaces bool kAppShortcutsHaveBeenCreated.

-
-  AppShortcutManager* shortcut_manager =
-      AppShortcutManagerFactory::GetForProfile(initial_profile);
-  if (shortcut_manager)
-    shortcut_manager->OnceOffCreateShortcuts();
 }
 
 void AppListServiceImpl::InvalidatePendingProfileLoads() {
   profile_loader_->InvalidatePendingProfileLoads();
 }
 
 void AppListServiceImpl::PerformStartupChecks(Profile* initial_profile) {
   // Except in rare, once-off cases, this just checks that a pref is "0" and
   // returns.
   RecordAppListDiscoverability(local_state_, true);
 
   if (command_line_.HasSwitch(switches::kResetAppListInstallState))
     local_state_->SetBoolean(prefs::kAppLauncherHasBeenEnabled, false);
 
   if (command_line_.HasSwitch(switches::kEnableAppList))
     EnableAppList(initial_profile, ENABLE_VIA_COMMAND_LINE);
 
   if (!base::MessageLoop::current())
     return;  // In a unit test.
 
   // Send app list usage stats after a delay.
   const int kSendUsageStatsDelay = 5;
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&AppListServiceImpl::SendAppListStats),
       base::TimeDelta::FromSeconds(kSendUsageStatsDelay));
 }