Adding ChromeVox as a component extensions (enabled only for ChromeOS, for no...

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
===================================================================
--- chrome/browser/profiles/profile_impl.cc	(revision 71755)
+++ chrome/browser/profiles/profile_impl.cc	(working copy)
@@ -14,6 +14,8 @@
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/values.h"
+#include "base/version.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
@@ -30,6 +32,7 @@
 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/default_apps.h"
+#include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_info_map.h"
@@ -87,9 +90,11 @@
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_pref_store.h"
+#include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/zip.h"
 #include "grit/browser_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/transport_security_state.h"
@@ -382,6 +387,15 @@
   component_extensions.push_back(
       std::make_pair("bookmark_manager", IDR_BOOKMARKS_MANIFEST));
 
+#if defined(OS_CHROMEOS)
+  // Register access extensions only if accessibility is enabled.
+  if (ExtensionAccessibilityEventRouter::GetInstance()->

[asargent_no_longer_on_chrome, 2011/01/20 05:55:59]

It seems kind of weird to ask the event router if accessibility is enabled - can
you just look at the pref value here?

[Chaitanya, 2011/01/20 20:04:52]

using prefs now

On 2011/01/20 05:55:59, Antony Sargent wrote:

+      IsAccessibilityEnabled()) {
+    component_extensions.push_back(
+        std::make_pair("access_chromevox", IDR_CHROMEVOX_MANIFEST));
+  }
+#endif
+
 #if defined(TOUCH_UI)
   component_extensions.push_back(
       std::make_pair("keyboard", IDR_KEYBOARD_MANIFEST));
@@ -403,6 +417,16 @@
     std::string manifest =
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             iter->second).as_string();
+
+#if defined(OS_CHROMEOS)
+    if (StartsWithASCII(iter->first, "access_", true)) {
+      path = GetPath().AppendASCII(
+          ExtensionService::kAccessibilityInstallDirectoryName);
+      path = path.AppendASCII(iter->first);
+      UnzipAccessibilityExtensionResources(iter->first, path, manifest);

[asargent_no_longer_on_chrome, 2011/01/20 05:55:59]

nit: it might read more clearly if you factor out the "are we up to date" check,
and then make this something like:

if (!AccessibilityExtensionIsUpToDate(...))
  UnzipAccessibilityExtensionResources(...)

[Chaitanya, 2011/01/20 20:04:52]

Done.

+    }
+#endif
+
     extensions_service_->register_component_extension(
         ExtensionService::ComponentExtensionInfo(manifest, path));
   }
@@ -422,6 +446,30 @@
   }
 }
 
+#if defined(OS_CHROMEOS)
+void ProfileImpl::UnzipAccessibilityExtensionResources(
+    const std::string ext_name,
+    const FilePath dir_path,
+    const std::string manifest) {
+  JSONStringValueSerializer serializer(manifest);
+  scoped_ptr<DictionaryValue> dict(
+      static_cast<DictionaryValue*>(serializer.Deserialize(NULL, NULL)));
+  std::string new_version_str = "0.0";
+  dict->GetString("version", &new_version_str);
+  scoped_ptr<Version> new_version(
+      Version::GetVersionFromString(new_version_str));
+  scoped_ptr<Version> curr_version(Version::GetVersionFromString(
+      GetPrefs()->GetString(prefs::kAccessibilityChromeVoxVersion)));
+  if (new_version->CompareTo(*curr_version.get()) == 1 &&
+      Unzip(FilePath().AppendASCII(extension_misc::kAccessExtensionCrxPath)
+          .AppendASCII(ext_name).ReplaceExtension(FILE_PATH_LITERAL(".zip")),

[asargent_no_longer_on_chrome, 2011/01/20 05:55:59]

This is a little hard to read. Can you factor this out into something like

FilePath zipfile_path = ....
bool success = Unzip(zipfile_path, dir_path);
if (success)
   ...

[Chaitanya, 2011/01/20 20:04:52]

Removed UnzipAccessibilityExtensionResources and added
IsAccessibilityExtensionUpToDate

On 2011/01/20 05:55:59, Antony Sargent wrote:

+          dir_path) {
+    GetPrefs()->SetString(prefs::kAccessibilityChromeVoxVersion,
+                          new_version_str);
+  }
+}
+#endif
+
 void ProfileImpl::InitWebResources() {
   if (web_resource_service_)
     return;