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

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

Issue 216923006: Add a component updater for the CLD2 data file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase onto latest master 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/file_util.h" 7 #include "base/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/bundle_locations.h" 10 #include "base/mac/bundle_locations.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 if (!PathService::Get(base::DIR_MODULE, &cur)) 339 if (!PathService::Get(base::DIR_MODULE, &cur))
340 return false; 340 return false;
341 cur = cur.Append(kO1DPluginFileName); 341 cur = cur.Append(kO1DPluginFileName);
342 break; 342 break;
343 case chrome::FILE_GTALK_PLUGIN: 343 case chrome::FILE_GTALK_PLUGIN:
344 if (!PathService::Get(base::DIR_MODULE, &cur)) 344 if (!PathService::Get(base::DIR_MODULE, &cur))
345 return false; 345 return false;
346 cur = cur.Append(kGTalkPluginFileName); 346 cur = cur.Append(kGTalkPluginFileName);
347 break; 347 break;
348 #endif 348 #endif
349 #if defined(CLD2_IS_COMPONENT)
350 case chrome::DIR_COMPONENT_CLD2:
351 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
352 return false;
353 cur = cur.Append(FILE_PATH_LITERAL("CLD"));
354 break;
355 #endif // defined(CLD2_IS_COMPONENT)
349 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) 356 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
350 #if defined(WIDEVINE_CDM_IS_COMPONENT) 357 #if defined(WIDEVINE_CDM_IS_COMPONENT)
351 case chrome::DIR_COMPONENT_WIDEVINE_CDM: 358 case chrome::DIR_COMPONENT_WIDEVINE_CDM:
352 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 359 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
353 return false; 360 return false;
354 cur = cur.Append(kWidevineCdmBaseDirectory); 361 cur = cur.Append(kWidevineCdmBaseDirectory);
355 break; 362 break;
356 #endif // defined(WIDEVINE_CDM_IS_COMPONENT) 363 #endif // defined(WIDEVINE_CDM_IS_COMPONENT)
357 // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings. 364 // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings.
358 // In the component case, this is the source adapter. Otherwise, it is the 365 // In the component case, this is the source adapter. Otherwise, it is the
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 578
572 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) { 579 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
573 g_invalid_specified_user_data_dir.Get() = user_data_dir; 580 g_invalid_specified_user_data_dir.Get() = user_data_dir;
574 } 581 }
575 582
576 const base::FilePath& GetInvalidSpecifiedUserDataDir() { 583 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
577 return g_invalid_specified_user_data_dir.Get(); 584 return g_invalid_specified_user_data_dir.Get();
578 } 585 }
579 586
580 } // namespace chrome 587 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698