Show app disable and enable on NTP, and desaturate non-offline-enabled apps when offline.

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 98 matching lines @@
   return false;
 }
 
 void AppLauncherHandler::CreateAppInfo(const Extension* extension,
                                        const AppNotification* notification,
                                        ExtensionService* service,
                                        DictionaryValue* value) {
   bool enabled = service->IsExtensionEnabled(extension->id()) &&
       !service->GetTerminatedExtension(extension->id());
   bool icon_big_exists = true;
+  // Instead of setting grayscale here, we do it in the js.

[Evan Stade, 2011/08/30 03:34:14]

probably best to check for NTP4

[Yoyo Zhou, 2011/08/30 17:37:10]

Done.

   GURL icon_big =
       ExtensionIconSource::GetIconURL(extension,
                                       Extension::EXTENSION_ICON_LARGE,
                                       ExtensionIconSet::MATCH_EXACTLY,
-                                      !enabled, &icon_big_exists);
+                                      false, &icon_big_exists);
   bool icon_small_exists = true;
   GURL icon_small =
       ExtensionIconSource::GetIconURL(extension,
                                       Extension::EXTENSION_ICON_BITTY,
                                       ExtensionIconSet::MATCH_BIGGER,
-                                      !enabled, &icon_small_exists);
+                                      false, &icon_small_exists);
 
   value->Clear();
   value->SetString("id", extension->id());
   value->SetString("name", extension->name());
   value->SetString("description", extension->description());
   value->SetString("launch_url", extension->GetFullLaunchURL().spec());
-  if (enabled)
-    value->SetString("options_url", extension->options_url().spec());
+  value->SetBoolean("enabled", enabled);
+  value->SetString("options_url", extension->options_url().spec());
   value->SetBoolean("can_uninstall",
                     Extension::UserMayDisable(extension->location()));
   value->SetString("icon_big", icon_big.spec());
   value->SetBoolean("icon_big_exists", icon_big_exists);
   value->SetString("icon_small", icon_small.spec());
   value->SetBoolean("icon_small_exists", icon_small_exists);
   value->SetInteger("launch_container", extension->launch_container());
   ExtensionPrefs* prefs = service->extension_prefs();
   value->SetInteger("launch_type",
       prefs->GetLaunchType(extension->id(),
                            ExtensionPrefs::LAUNCH_DEFAULT));
+  value->SetBoolean("offline_enabled", extension->offline_enabled());
   value->SetBoolean("is_component",
       extension->location() == Extension::COMPONENT);
   value->SetBoolean("is_webstore",
       extension->id() == extension_misc::kWebStoreAppId);
 
   if (notification)
     value->Set("notification", SerializeNotification(*notification));
 
   int app_launch_index = prefs->GetAppLaunchIndex(extension->id());
   if (app_launch_index == -1) {
@@ skipping 128 matching lines @@
               attempted_bookmark_app_install_));
         attempted_bookmark_app_install_ = false;
         web_ui_->CallJavascriptFunction("ntp4.appAdded", *app_info, *highlight);
       }
 
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const Extension* extension =
           Details<UnloadedExtensionInfo>(details)->extension;
+      bool is_uninstall =

[Evan Stade, 2011/08/30 03:34:14]

define this right above first use, not here

[Yoyo Zhou, 2011/08/30 17:37:10]

Done.

+          (Details<UnloadedExtensionInfo>(details)->reason ==

[Evan Stade, 2011/08/30 03:34:14]

don't need ()

[Yoyo Zhou, 2011/08/30 17:37:10]

Gone.

+           extension_misc::UNLOAD_REASON_UNINSTALL);
       if (!extension->is_app())
         return;
 
       if (!NewTabUI::NTP4Enabled()) {
         HandleGetApps(NULL);
         break;
       }
 
       scoped_ptr<DictionaryValue> app_info(GetAppInfo(extension));
-      if (app_info.get())
-        web_ui_->CallJavascriptFunction("ntp4.appRemoved", *app_info);
-      break;
+      scoped_ptr<BooleanValue> uninstall_value(
+          Value::CreateBooleanValue(is_uninstall));
+      if (app_info.get()) {
+        web_ui_->CallJavascriptFunction(
+            "ntp4.appRemoved", *app_info, *uninstall_value);
+      }

[Evan Stade, 2011/08/30 03:34:14]

no break?

[Yoyo Zhou, 2011/08/30 17:37:10]

Argh, lost it in the merge. Good catch.

     }
     case chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED:
     // The promo may not load until a couple seconds after the first NTP view,
     // so we listen for the load notification and notify the NTP when ready.
     case chrome::NOTIFICATION_WEB_STORE_PROMO_LOADED:
       if (web_ui_->tab_contents())
         HandleGetApps(NULL);
       break;
     case chrome::NOTIFICATION_PREF_CHANGED: {
       if (!web_ui_->tab_contents())
@@ skipping 634 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extension_service_->apps_promo();
   const ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extension_service_->GetExtensionById(*iter, true))
       extension_service_->UninstallExtension(*iter, false, NULL);
   }
 }