Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6985)

Unified Diff: chrome/browser/ui/webui/app_list/start_page_ui.cc

Issue 229323003: Modifies handling of hotword NaCl module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/app_list/start_page_handler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/app_list/start_page_ui.cc
diff --git a/chrome/browser/ui/webui/app_list/start_page_ui.cc b/chrome/browser/ui/webui/app_list/start_page_ui.cc
index e265762853c995d2db95c25db9adaf86c93e630b..1a6244062c7f1f6bfc90b5bcd3092d2ab5911123 100644
--- a/chrome/browser/ui/webui/app_list/start_page_ui.cc
+++ b/chrome/browser/ui/webui/app_list/start_page_ui.cc
@@ -24,12 +24,9 @@
namespace app_list {
namespace {
#if defined(OS_CHROMEOS)
-const char* kHotwordFilenames[] = {
- "greconacl.nmf",
- "hotword.data",
- "_platform_specific/arm/hotword_arm.nexe",
- "_platform_specific/x86-32/hotword_x86_32.nexe",
- "_platform_specific/x86-64/hotword_x86_64.nexe",
+const char* kHotwordFilePrefixes[] = {
+ "hotword_",
+ "_platform_specific/",
};
void LoadModelData(const base::FilePath& base_dir,
@@ -53,8 +50,8 @@ bool HandleHotwordFilesResourceFilter(
if (!extension)
return false;
- for (size_t i = 0; i < arraysize(kHotwordFilenames); ++i) {
- if (path == kHotwordFilenames[i]) {
+ for (size_t i = 0; i < arraysize(kHotwordFilePrefixes); ++i) {
+ if (path.find(kHotwordFilePrefixes[i]) == 0) {
content::BrowserThread::PostTask(
content::BrowserThread::FILE,
FROM_HERE,
« no previous file with comments | « chrome/browser/ui/webui/app_list/start_page_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698