diff options
Diffstat (limited to 'chrome/browser/dom_ui/app_launcher_handler.cc')
| -rw-r--r-- | chrome/browser/dom_ui/app_launcher_handler.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc index cad0727..64d128a 100644 --- a/chrome/browser/dom_ui/app_launcher_handler.cc +++ b/chrome/browser/dom_ui/app_launcher_handler.cc @@ -186,11 +186,22 @@ void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) { dictionary->SetBoolean("disableAppWindowLaunch", true); dictionary->SetBoolean("disableCreateAppShortcut", true); #endif + #if defined(OS_CHROMEOS) // Making shortcut does not make sense on ChromeOS because it does not have // a desktop. dictionary->SetBoolean("disableCreateAppShortcut", true); #endif + + // We always show the launcher on Chrome OS. On Desktop Chrome, only show it + // if we've installed our default apps. +#if defined(OS_CHROMEOS) + dictionary->SetBoolean("showLauncher", true); +#else + dictionary->SetBoolean( + "showLauncher", + extensions_service_->default_apps()->GetDefaultAppsInstalled()); +#endif } void AppLauncherHandler::HandleGetApps(const ListValue* args) { |