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

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

Issue 15658009: Fix a type mismatch on Windows caused by r201738. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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/logging.h" 8 #include "base/logging.h"
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 return false; 361 return false;
362 cur = cur.Append(kWidevineCdmBaseDirectory); 362 cur = cur.Append(kWidevineCdmBaseDirectory);
363 break; 363 break;
364 #endif // defined(WIDEVINE_CDM_IS_COMPONENT) 364 #endif // defined(WIDEVINE_CDM_IS_COMPONENT)
365 // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings. 365 // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings.
366 // In the component case, this is the source adapter. Otherwise, it is the 366 // In the component case, this is the source adapter. Otherwise, it is the
367 // actual Pepper module that gets loaded. 367 // actual Pepper module that gets loaded.
368 case chrome::FILE_WIDEVINE_CDM_ADAPTER: 368 case chrome::FILE_WIDEVINE_CDM_ADAPTER:
369 if (!GetInternalPluginsDirectory(&cur)) 369 if (!GetInternalPluginsDirectory(&cur))
370 return false; 370 return false;
371 cur = cur.Append(kWidevineCdmAdapterFileName); 371 cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
372 break; 372 break;
373 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) 373 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
374 case chrome::FILE_RESOURCES_PACK: 374 case chrome::FILE_RESOURCES_PACK:
375 #if defined(OS_MACOSX) && !defined(OS_IOS) 375 #if defined(OS_MACOSX) && !defined(OS_IOS)
376 if (base::mac::AmIBundled()) { 376 if (base::mac::AmIBundled()) {
377 cur = base::mac::FrameworkBundlePath(); 377 cur = base::mac::FrameworkBundlePath();
378 cur = cur.Append(FILE_PATH_LITERAL("Resources")) 378 cur = cur.Append(FILE_PATH_LITERAL("Resources"))
379 .Append(FILE_PATH_LITERAL("resources.pak")); 379 .Append(FILE_PATH_LITERAL("resources.pak"));
380 break; 380 break;
381 } 381 }
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 return true; 527 return true;
528 } 528 }
529 529
530 // This cannot be done as a static initializer sadly since Visual Studio will 530 // This cannot be done as a static initializer sadly since Visual Studio will
531 // eliminate this object file if there is no direct entry point into it. 531 // eliminate this object file if there is no direct entry point into it.
532 void RegisterPathProvider() { 532 void RegisterPathProvider() {
533 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); 533 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
534 } 534 }
535 535
536 } // namespace chrome 536 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/widevine_cdm_component_installer.cc ('k') | third_party/widevine/cdm/widevine_cdm_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698