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

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

Issue 1298013002: Address some additional cleanup work needed for the component flash updates on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove useless GetPepperFlashBaseDirectory() wrapper Created 5 years, 4 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
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/component_flash_hint_file_linux.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/files/file_util.h" 7 #include "base/files/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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 #if defined(OS_ANDROID) 567 #if defined(OS_ANDROID)
568 case chrome::DIR_OFFLINE_PAGE_METADATA: 568 case chrome::DIR_OFFLINE_PAGE_METADATA:
569 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 569 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
570 return false; 570 return false;
571 cur = cur.Append(kOfflinePageMetadataDirname); 571 cur = cur.Append(kOfflinePageMetadataDirname);
572 break; 572 break;
573 #endif // defined(OS_ANDROID) 573 #endif // defined(OS_ANDROID)
574 #if defined(OS_LINUX) 574 #if defined(OS_LINUX)
575 case chrome::FILE_COMPONENT_FLASH_HINT: 575 case chrome::FILE_COMPONENT_FLASH_HINT:
576 if (!PathService::Get(chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, 576 if (!PathService::Get(chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN,
577 &cur)) 577 &cur)) {
578 return false; 578 return false;
579 }
579 cur = cur.Append(kComponentUpdatedFlashHint); 580 cur = cur.Append(kComponentUpdatedFlashHint);
580 break; 581 break;
581 #endif // defined(OS_LINUX) 582 #endif // defined(OS_LINUX)
582 583
583 default: 584 default:
584 return false; 585 return false;
585 } 586 }
586 587
587 // TODO(bauerb): http://crbug.com/259796 588 // TODO(bauerb): http://crbug.com/259796
588 base::ThreadRestrictions::ScopedAllowIO allow_io; 589 base::ThreadRestrictions::ScopedAllowIO allow_io;
(...skipping 13 matching lines...) Expand all
602 603
603 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) { 604 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
604 g_invalid_specified_user_data_dir.Get() = user_data_dir; 605 g_invalid_specified_user_data_dir.Get() = user_data_dir;
605 } 606 }
606 607
607 const base::FilePath& GetInvalidSpecifiedUserDataDir() { 608 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
608 return g_invalid_specified_user_data_dir.Get(); 609 return g_invalid_specified_user_data_dir.Get();
609 } 610 }
610 611
611 } // namespace chrome 612 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/component_flash_hint_file_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698