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

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

Issue 9316077: Enable audio/video tag in content_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix content_unittests Created 8 years, 9 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
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/renderer/chrome_render_process_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/mac/bundle_locations.h" 10 #include "base/mac/bundle_locations.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 break; 213 break;
214 case chrome::DIR_USER_DATA_TEMP: 214 case chrome::DIR_USER_DATA_TEMP:
215 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 215 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
216 return false; 216 return false;
217 cur = cur.Append(FILE_PATH_LITERAL("Temp")); 217 cur = cur.Append(FILE_PATH_LITERAL("Temp"));
218 break; 218 break;
219 case chrome::DIR_INTERNAL_PLUGINS: 219 case chrome::DIR_INTERNAL_PLUGINS:
220 if (!GetInternalPluginsDirectory(&cur)) 220 if (!GetInternalPluginsDirectory(&cur))
221 return false; 221 return false;
222 break; 222 break;
223 case chrome::DIR_MEDIA_LIBS:
224 #if defined(OS_MACOSX)
225 *result = base::mac::FrameworkBundlePath();
226 *result = result->Append("Libraries");
227 return true;
228 #else
229 return PathService::Get(chrome::DIR_APP, result);
230 #endif
231 case chrome::DIR_PEPPER_FLASH_PLUGIN: 223 case chrome::DIR_PEPPER_FLASH_PLUGIN:
232 if (!GetInternalPluginsDirectory(&cur)) 224 if (!GetInternalPluginsDirectory(&cur))
233 return false; 225 return false;
234 cur = cur.Append(FILE_PATH_LITERAL("PepperFlash")); 226 cur = cur.Append(FILE_PATH_LITERAL("PepperFlash"));
235 break; 227 break;
236 case chrome::FILE_LOCAL_STATE: 228 case chrome::FILE_LOCAL_STATE:
237 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 229 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
238 return false; 230 return false;
239 cur = cur.Append(chrome::kLocalStateFilename); 231 cur = cur.Append(chrome::kLocalStateFilename);
240 break; 232 break;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 return true; 435 return true;
444 } 436 }
445 437
446 // This cannot be done as a static initializer sadly since Visual Studio will 438 // This cannot be done as a static initializer sadly since Visual Studio will
447 // eliminate this object file if there is no direct entry point into it. 439 // eliminate this object file if there is no direct entry point into it.
448 void RegisterPathProvider() { 440 void RegisterPathProvider() {
449 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); 441 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
450 } 442 }
451 443
452 } // namespace chrome 444 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/renderer/chrome_render_process_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698