summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 04:38:02 +0000
committertyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 04:38:02 +0000
commitb14bd53b56ed2de26144a98e6f12616ca1e035d7 (patch)
tree916b63cf01ede7017798cf1069f089ff4c4ed131
parentd81ebae3ce39a9218ec3229ee61800f1a86dbd72 (diff)
downloadchromium_src-b14bd53b56ed2de26144a98e6f12616ca1e035d7.zip
chromium_src-b14bd53b56ed2de26144a98e6f12616ca1e035d7.tar.gz
chromium_src-b14bd53b56ed2de26144a98e6f12616ca1e035d7.tar.bz2
Revert 233173 "Merge 232553 "Create shortcuts when app launcher ..."
> Merge 232553 "Create shortcuts when app launcher is enabled." > > > Create shortcuts when app launcher is enabled. > > > > This change mostly affects Mac. At the moment, if app shims are not > > enabled, syncing of v2 apps does not create shims for those apps. > > If app shims are then enabled by enabling the app launcher, these shims > > will not be created until the next restart of Chrome. This CL runs a > > OnceOffCreateShortcuts (the same method run on startup) when the app > > launcher is enabled. > > > > BUG=313106 > > TEST=Start with a fresh install of Chrome. > > Sign in with an account that has v2 apps. > > Wait for the apps to sync. > > Enable the app launcher. > > App shims should be installed for synced apps. > > Launch an app, it should have an icon in the dock. > > > > Review URL: https://codereview.chromium.org/54383005 > > TBR=jackhou@chromium.org > > Review URL: https://codereview.chromium.org/60363004 TBR=jackhou@chromium.org Review URL: https://codereview.chromium.org/61503002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@233204 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/app_list/app_list_service_impl.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.cc b/chrome/browser/ui/app_list/app_list_service_impl.cc
index b157626..8fcd398 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.cc
+++ b/chrome/browser/ui/app_list/app_list_service_impl.cc
@@ -9,8 +9,6 @@
#include "base/metrics/histogram.h"
#include "base/prefs/pref_service.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/profiles/profile_manager.h"
#include "chrome/common/chrome_constants.h"
@@ -185,8 +183,6 @@ void AppListServiceImpl::EnableAppList(Profile* initial_profile) {
SetAppListEnabledPreference(true);
CreateShortcut();
- AppShortcutManagerFactory::GetForProfile(initial_profile)->
- OnceOffCreateShortcuts();
}
Profile* AppListServiceImpl::GetCurrentAppListProfile() {