Google Now Extension Auto Download

chrome/browser/extensions/external_component_loader.cc

 // Copyright (c) 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/extensions/external_component_loader.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/features/simple_feature.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/command_line.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
+#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)

[benwells, 2015/02/10 22:34:01]

I think this can just be #if defined(OS_CHROMEOS).

[robliao, 2015/02/10 22:37:53]

We're still gated by the gyp file with regards to ENABLE_APP_LIST, so for
correctness this needs to be here.

+#include "chrome/browser/ui/app_list/app_list_extension.h"
+#endif
+
 namespace extensions {
 
 ExternalComponentLoader::ExternalComponentLoader(Profile* profile)
     : profile_(profile) {
 }
 
 ExternalComponentLoader::~ExternalComponentLoader() {}
 
 // static
 bool ExternalComponentLoader::IsModifiable(const Extension* extension) {
@@ skipping 44 matching lines @@
     base::CommandLine* const command_line =
         base::CommandLine::ForCurrentProcess();
     if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker)) {
       const std::string extension_id = extension_misc::kZIPUnpackerExtensionId;
       prefs_->SetString(extension_id + ".external_update_url",
                         extension_urls::GetWebstoreUpdateUrl().spec());
     }
   }
 #endif
 
+#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
+  std::string app_list_extension_id;
+  if (GetAppListExtensionId(&app_list_extension_id)) {
+    prefs_->SetString(app_list_extension_id + ".external_update_url",
+                      extension_urls::GetWebstoreUpdateUrl().spec());
+  }
+#endif
+
   LoadFinished();
 }
 
 }  // namespace extensions