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

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

Issue 10911137: Remove bundled NPAPI Flash on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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/common/pref_names.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/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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 248 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
249 return false; 249 return false;
250 cur = cur.Append(chrome::kLocalStateFilename); 250 cur = cur.Append(chrome::kLocalStateFilename);
251 break; 251 break;
252 case chrome::FILE_RECORDED_SCRIPT: 252 case chrome::FILE_RECORDED_SCRIPT:
253 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 253 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
254 return false; 254 return false;
255 cur = cur.Append(FILE_PATH_LITERAL("script.log")); 255 cur = cur.Append(FILE_PATH_LITERAL("script.log"));
256 break; 256 break;
257 case chrome::FILE_FLASH_PLUGIN: 257 case chrome::FILE_FLASH_PLUGIN:
258 case chrome::FILE_FLASH_PLUGIN_EXISTING:
258 if (!GetInternalPluginsDirectory(&cur)) 259 if (!GetInternalPluginsDirectory(&cur))
259 return false; 260 return false;
260 cur = cur.Append(kInternalFlashPluginFileName); 261 cur = cur.Append(kInternalFlashPluginFileName);
261 if (!file_util::PathExists(cur)) 262 if (key == chrome::FILE_FLASH_PLUGIN_EXISTING &&
263 !file_util::PathExists(cur))
262 return false; 264 return false;
263 break; 265 break;
264 case chrome::FILE_PEPPER_FLASH_PLUGIN: 266 case chrome::FILE_PEPPER_FLASH_PLUGIN:
265 if (!PathService::Get(chrome::DIR_PEPPER_FLASH_PLUGIN, &cur)) 267 if (!PathService::Get(chrome::DIR_PEPPER_FLASH_PLUGIN, &cur))
266 return false; 268 return false;
267 cur = cur.Append(chrome::kPepperFlashPluginFilename); 269 cur = cur.Append(chrome::kPepperFlashPluginFilename);
268 break; 270 break;
269 case chrome::FILE_PDF_PLUGIN: 271 case chrome::FILE_PDF_PLUGIN:
270 if (!GetInternalPluginsDirectory(&cur)) 272 if (!GetInternalPluginsDirectory(&cur))
271 return false; 273 return false;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 return true; 446 return true;
445 } 447 }
446 448
447 // This cannot be done as a static initializer sadly since Visual Studio will 449 // This cannot be done as a static initializer sadly since Visual Studio will
448 // eliminate this object file if there is no direct entry point into it. 450 // eliminate this object file if there is no direct entry point into it.
449 void RegisterPathProvider() { 451 void RegisterPathProvider() {
450 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); 452 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
451 } 453 }
452 454
453 } // namespace chrome 455 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698