Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(602)

Unified Diff: chrome/browser/dom_ui/app_launcher_handler.cc

Issue 5958002: Do not show apps section until default apps are installed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/default_apps.h » ('j') | chrome/browser/resources/new_new_tab.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/app_launcher_handler.cc
diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
index 01bffa9cea93ca62cbdacb37583c39790c17870c..ff7a6a01aab8cf9414902e0de8c5261ea14cdf0a 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/dom_ui/app_launcher_handler.cc
@@ -186,6 +186,16 @@ void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
dictionary->SetBoolean("disableAppWindowLaunch", true);
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) {
« no previous file with comments | « no previous file | chrome/browser/extensions/default_apps.h » ('j') | chrome/browser/resources/new_new_tab.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698