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

Side by Side Diff: chrome/common/chrome_paths.cc

Issue 8348026: Add a component installer for Portable NaCl. Registration of installer is (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes to rebase Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/chrome_paths.h" 5 #include "chrome/common/chrome_paths.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 case chrome::FILE_PDF_PLUGIN: 235 case chrome::FILE_PDF_PLUGIN:
236 if (!GetInternalPluginsDirectory(&cur)) 236 if (!GetInternalPluginsDirectory(&cur))
237 return false; 237 return false;
238 cur = cur.Append(kInternalPDFPluginFileName); 238 cur = cur.Append(kInternalPDFPluginFileName);
239 break; 239 break;
240 case chrome::FILE_NACL_PLUGIN: 240 case chrome::FILE_NACL_PLUGIN:
241 if (!GetInternalPluginsDirectory(&cur)) 241 if (!GetInternalPluginsDirectory(&cur))
242 return false; 242 return false;
243 cur = cur.Append(kInternalNaClPluginFileName); 243 cur = cur.Append(kInternalNaClPluginFileName);
244 break; 244 break;
245 // TODO(jvoung): Do we want a default value or just the ability to
246 // override immediately when testing on bots to avoid race conditions?
247 case chrome::FILE_PNACL_COMPONENT:
248 return false;
249 break;
245 #if defined(OS_POSIX) && !defined(OS_MACOSX) 250 #if defined(OS_POSIX) && !defined(OS_MACOSX)
246 case chrome::FILE_NACL_HELPER: 251 case chrome::FILE_NACL_HELPER:
247 if (!PathService::Get(base::DIR_MODULE, &cur)) 252 if (!PathService::Get(base::DIR_MODULE, &cur))
248 return false; 253 return false;
249 cur = cur.Append(kInternalNaClHelperFileName); 254 cur = cur.Append(kInternalNaClHelperFileName);
250 break; 255 break;
251 case chrome::FILE_NACL_HELPER_BOOTSTRAP: 256 case chrome::FILE_NACL_HELPER_BOOTSTRAP:
252 if (!PathService::Get(base::DIR_MODULE, &cur)) 257 if (!PathService::Get(base::DIR_MODULE, &cur))
253 return false; 258 return false;
254 cur = cur.Append(kInternalNaClHelperBootstrapFileName); 259 cur = cur.Append(kInternalNaClHelperBootstrapFileName);
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 return true; 398 return true;
394 } 399 }
395 400
396 // This cannot be done as a static initializer sadly since Visual Studio will 401 // This cannot be done as a static initializer sadly since Visual Studio will
397 // eliminate this object file if there is no direct entry point into it. 402 // eliminate this object file if there is no direct entry point into it.
398 void RegisterPathProvider() { 403 void RegisterPathProvider() {
399 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); 404 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
400 } 405 }
401 406
402 } // namespace chrome 407 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698