Modified components ui to address concern of all the time disabled check update button.

chrome/browser/ui/webui/components_ui.cc

 // Copyright 2013 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/components_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 58 matching lines @@
   virtual void RegisterMessages() OVERRIDE;
 
   // Callback for the "requestComponentsData" message.
   void HandleRequestComponentsData(const base::ListValue* args);
 
   // Callback for the "checkUpdate" message.
   void HandleCheckUpdate(const base::ListValue* args);
 
  private:
   void LoadComponents();
+  void ComponentsDOMHandler::HandleRequestComponentStatus(
+      const base::ListValue* args);
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ComponentsDOMHandler);
 };
 
 ComponentsDOMHandler::ComponentsDOMHandler() {
 }
 
 void ComponentsDOMHandler::RegisterMessages() {
-  web_ui()->RegisterMessageCallback("requestComponentsData",
+  web_ui()->RegisterMessageCallback(
+      "requestComponentsData",
       base::Bind(&ComponentsDOMHandler::HandleRequestComponentsData,
                  base::Unretained(this)));
 
-  web_ui()->RegisterMessageCallback("checkUpdate",
+  web_ui()->RegisterMessageCallback(
+      "checkUpdate",
       base::Bind(&ComponentsDOMHandler::HandleCheckUpdate,
                  base::Unretained(this)));
+
+  web_ui()->RegisterMessageCallback(
+      "requestComponentStatus",
+      base::Bind(&ComponentsDOMHandler::HandleRequestComponentStatus,
+                 base::Unretained(this)));
 }
 
 void ComponentsDOMHandler::HandleRequestComponentsData(
     const base::ListValue* args) {
   LoadComponents();
 }
 
 // This function is called when user presses button from html UI.
 // TODO(shrikant): We need to make this button available based on current
 // state e.g. If component state is currently updating then we need to disable
 // button. (https://code.google.com/p/chromium/issues/detail?id=272540)
 void ComponentsDOMHandler::HandleCheckUpdate(const base::ListValue* args) {
   if (args->GetSize() != 1) {
     NOTREACHED();
     return;
   }
 
   std::string component_id;
   if (!args->GetString(0, &component_id)) {
     NOTREACHED();
     return;
   }
 
   ComponentsUI::OnDemandUpdate(component_id);
 }
 
+void ComponentsDOMHandler::HandleRequestComponentStatus(
+    const base::ListValue* args) {
+  if (args->GetSize() != 1) {
+    NOTREACHED();
+    return;
+  }
+
+  std::string component_id;
+  if (!args->GetString(0, &component_id)) {
+    NOTREACHED();
+    return;
+  }
+
+  component_updater::ComponentUpdateService* cus =
+      g_browser_process->component_updater();
+  component_updater::ComponentUpdateService::Status status =
+      cus->GetComponentStatus(component_id);
+
+  std::string string_status;
+  if (status == component_updater::ComponentUpdateService::kInProgress)
+    string_status = "in-progress";
+  else if (status == component_updater::ComponentUpdateService::kOk)
+    string_status = "ok";
+  else
+    string_status = "error";
+
+  web_ui()->CallJavascriptFunction("returnComponentStatus",
+                                   base::StringValue(component_id),
+                                   base::StringValue(string_status));
+}
+
 void ComponentsDOMHandler::LoadComponents() {
   component_updater::ComponentUpdateService* cus =
       g_browser_process->component_updater();
   std::vector<component_updater::CrxComponentInfo> components;
   cus->GetComponents(&components);
 
   // Construct DictionaryValues to return to UI.
   base::ListValue* component_list = new base::ListValue();
   for (size_t j = 0; j < components.size(); ++j) {
     const component_updater::CrxComponentInfo& component = components[j];
 
     base::DictionaryValue* component_entry = new base::DictionaryValue();
     component_entry->SetString("id", component.id);
     component_entry->SetString("name", component.name);
     component_entry->SetString("version", component.version);
+    switch (component.status) {
+      case component_updater::ComponentUpdateService::kInProgress:
+        component_entry->SetString("status", "in-progress");
+        break;
+      case component_updater::ComponentUpdateService::kOk:
+        component_entry->SetString("status", "ok");
+        break;
+      case component_updater::ComponentUpdateService::kError:
+        component_entry->SetString("status", "error");
+        break;
+    }
 
     component_list->Append(component_entry);
   }
 
   base::DictionaryValue results;
   results.Set("components", component_list);
   web_ui()->CallJavascriptFunction("returnComponentsData", results);
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // ComponentsUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ComponentsUI::ComponentsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new ComponentsDOMHandler());
 
   // Set up the chrome://components/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateComponentsUIHTMLSource(profile));
+  component_updater::ComponentUpdateService* cus =
+      g_browser_process->component_updater();
+  cus->AddObserver(this);

[Sorin Jianu, 2014/04/28 22:46:11]

Are we removing the observer anywhere? Is there any way ComponentsUI is
destroyed before the ComponentUpdateService? The observers are not refcounted,
unfortunately.

 }
 
 // static
 void ComponentsUI::OnDemandUpdate(const std::string& component_id) {
   component_updater::ComponentUpdateService* cus =
       g_browser_process->component_updater();
   cus->OnDemandUpdate(component_id);
 }
 
 // static
 base::RefCountedMemory* ComponentsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_PLUGINS_FAVICON, scale_factor);
 }
+
+void ComponentsUI::ComponentEventToString(Events event,
+                                          std::string* converted_event) {
+  DCHECK(converted_event != NULL);

[Sorin Jianu, 2014/04/28 22:46:11]

It seems converted_event is some kind of a an event name. Perhaps call it
event_name and define the constants somewhere? I appears these string literals
have to be stable, a comment would be in order.

+  switch (event) {
+    case COMPONENT_UPDATER_STARTED:
+      *converted_event = "UpdaterStarted";
+      return;
+    case COMPONENT_UPDATER_SLEEPING:
+      *converted_event = "UpdaterSleeping";
+      return;
+    case COMPONENT_UPDATE_FOUND:
+      *converted_event = "UpdateFound";
+      return;
+    case COMPONENT_UPDATE_READY:
+      *converted_event = "UpdateReady";
+      return;
+    case COMPONENT_UPDATED:
+      *converted_event = "ComponentUpdated";
+      return;
+    case COMPONENT_NOT_UPDATED:
+      *converted_event = "ComponentNotUpdated";
+      return;
+    default:
+      *converted_event = "Unknown";
+      return;
+  }
+}
+
+void ComponentsUI::OnEvent(Events event, const std::string& id) {
+  std::string converted_event;
+  ComponentEventToString(event, &converted_event);
+  base::DictionaryValue parameters;
+  parameters.SetString("event", converted_event.c_str());
+  if (!id.empty())
+    parameters.SetString("id", id.c_str());
+  web_ui()->CallJavascriptFunction("onComponentEvent", parameters);
+}