diff options
| author | beaudoin@chromium.org <beaudoin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 18:40:22 +0000 |
|---|---|---|
| committer | beaudoin@chromium.org <beaudoin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 18:40:22 +0000 |
| commit | a740c8acf1fb1f9bb8d20f8fdf94e9d229e080ce (patch) | |
| tree | a37aa73851722196bb65eb9995fb6cb81396a8fc | |
| parent | 7218e4ead141aaf8c3369705e683b54e9abcdaeb (diff) | |
| download | chromium_src-a740c8acf1fb1f9bb8d20f8fdf94e9d229e080ce.zip chromium_src-a740c8acf1fb1f9bb8d20f8fdf94e9d229e080ce.tar.gz chromium_src-a740c8acf1fb1f9bb8d20f8fdf94e9d229e080ce.tar.bz2 | |
Apps bookmark should remain when App Launcher is installed on non-Ash platforms.
BUG=232858
TEST=Launch Chrome on Windows with App Launcher previously installed and instant extended. Observe the Apps shortcut bookmark is visible in the NTP.
Review URL: https://chromiumcodereview.appspot.com/13837003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195856 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/bookmarks/bookmark_utils.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index c863603..7ea4fc3 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -267,9 +267,13 @@ string16 FormatBookmarkURLForDisplay(const GURL& url, } bool IsAppsShortcutEnabled(const Profile* profile) { - return chrome::IsInstantExtendedAPIEnabled() && - !apps::WasAppLauncherEnabled() && - !profile->IsOffTheRecord(); +#if defined(USE_ASH) + // Don't show the apps shortcut in ash when the app launcher is enabled. + if (apps::WasAppLauncherEnabled()) + return false; +#endif + + return chrome::IsInstantExtendedAPIEnabled() && !profile->IsOffTheRecord(); } bool ShouldShowAppsShortcutInBookmarkBar(Profile* profile) { |