Merge 69758 - Do not show apps section until default apps are installed....

chrome/browser/dom_ui/app_launcher_handler.cc

Index: chrome/browser/dom_ui/app_launcher_handler.cc
===================================================================
--- chrome/browser/dom_ui/app_launcher_handler.cc	(revision 71005)
+++ chrome/browser/dom_ui/app_launcher_handler.cc	(working copy)
@@ -186,6 +186,16 @@
   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) {