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

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

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/common/chrome_switches.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/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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 return false; 428 return false;
429 cur = cur.Append(FILE_PATH_LITERAL("wallpaper_thumbnails")); 429 cur = cur.Append(FILE_PATH_LITERAL("wallpaper_thumbnails"));
430 break; 430 break;
431 case chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS: 431 case chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS:
432 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 432 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
433 return false; 433 return false;
434 cur = cur.Append(FILE_PATH_LITERAL("custom_wallpapers")); 434 cur = cur.Append(FILE_PATH_LITERAL("custom_wallpapers"));
435 break; 435 break;
436 #endif 436 #endif
437 #if defined(OS_LINUX) && defined(ENABLE_MANAGED_USERS) 437 #if defined(OS_LINUX) && defined(ENABLE_MANAGED_USERS)
438 case chrome::DIR_MANAGED_USERS_DEFAULT_APPS: 438 case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS:
439 if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur)) 439 if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur))
440 return false; 440 return false;
441 cur = cur.Append(FILE_PATH_LITERAL("managed_users")); 441 cur = cur.Append(FILE_PATH_LITERAL("managed_users"));
442 break; 442 break;
443 #endif 443 #endif
444 // The following are only valid in the development environment, and 444 // The following are only valid in the development environment, and
445 // will fail if executed from an installed executable (because the 445 // will fail if executed from an installed executable (because the
446 // generated path won't exist). 446 // generated path won't exist).
447 case chrome::DIR_GEN_TEST_DATA: 447 case chrome::DIR_GEN_TEST_DATA:
448 if (!PathService::Get(base::DIR_MODULE, &cur)) 448 if (!PathService::Get(base::DIR_MODULE, &cur))
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 607
608 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) { 608 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
609 g_invalid_specified_user_data_dir.Get() = user_data_dir; 609 g_invalid_specified_user_data_dir.Get() = user_data_dir;
610 } 610 }
611 611
612 const base::FilePath& GetInvalidSpecifiedUserDataDir() { 612 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
613 return g_invalid_specified_user_data_dir.Get(); 613 return g_invalid_specified_user_data_dir.Get();
614 } 614 }
615 615
616 } // namespace chrome 616 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698