Add new PathService paths for Windows' All Users Desktop and Quick Launch folders.

base/base_paths_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/base_paths_mac.h"
+// Defines base::PathProviderMac which replaces base::PathProviderPosix for
+// OS_MAXOSX in base/path_service.cc.

[grt (UTC plus 2), 2012/09/19 16:44:46]

"OS_MAXOSX" -> "Mac" for consistency with base_paths_posix.cc.

[gab, 2012/09/19 18:22:58]

Done.

 
 #include <dlfcn.h>
 #import <Foundation/Foundation.h>
 #include <mach-o/dyld.h>
 
+#include "base/base_paths.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 
 namespace {
 
@@ skipping 23 matching lines @@
   *path = FilePath(info.dli_fname);
   return true;
 }
 
 }  // namespace
 
 namespace base {
 
 bool PathProviderMac(int key, FilePath* result) {
   switch (key) {
-    case base::FILE_EXE:
+    case base::FILE_EXE: {

[grt (UTC plus 2), 2012/09/19 16:44:46]

i think it's more consistent with Chromium style to omit the braces when not
needed.

[gab, 2012/09/19 18:22:58]

Ok removed it for all but the two big ones (with #ifdefs) as I feel it's easier
to for the reader to be able to do bracket matching in the text editor to see
how far the handling of each big case goes...

(this seems to be the rule already used in base_paths_win.cc.

[grt (UTC plus 2), 2012/09/19 19:12:06]

i don't understand this logic; handling goes until the next "case" statement. 
DIR_APP_DATA needs the braces, DIR_SOURCE_ROOT doesn't.  i'm okay if you leave
it this way, but it seems arbitrary to me, whereas "braces when required" is
simple.

[gab, 2012/09/19 19:44:25]

You're right, better to go by the simple rule, done.

       GetNSExecutablePath(result);
       return true;
-    case base::FILE_MODULE:
+    }
+    case base::FILE_MODULE: {
       return GetModulePathForAddress(result,
           reinterpret_cast<const void*>(&base::PathProviderMac));
-    case base::DIR_CACHE:
-      return base::mac::GetUserDirectory(NSCachesDirectory, result);
+    }
     case base::DIR_APP_DATA: {
       bool success = base::mac::GetUserDirectory(NSApplicationSupportDirectory,
                                                  result);
 #if defined(OS_IOS)
       // On IOS, this directory does not exist unless it is created explicitly.
       if (success && !file_util::PathExists(*result))
         success = file_util::CreateDirectory(*result);
 #endif  // defined(OS_IOS)
       return success;
     }
@@ skipping 12 matching lines @@
         // src/xcodebuild/{Debug|Release}/Chromium.app/Contents/MacOS/Chromium
         *result = result->DirName().DirName().DirName().DirName().DirName();
       } else {
         // Unit tests execute two levels deep from the source root, eg:
         // src/xcodebuild/{Debug|Release}/base_unittests
         *result = result->DirName().DirName();
       }
 #endif
       return true;
     }
+    case base::DIR_USER_DESKTOP: {
+      return base::mac::GetUserDirectory(NSDesktopDirectory, result);
+    }
+    case base::DIR_CACHE: {
+      return base::mac::GetUserDirectory(NSCachesDirectory, result);
+    }
     case base::DIR_HOME: {
       *result = base::mac::NSStringToFilePath(NSHomeDirectory());
       return true;
     }
     default:
       return false;
   }
 }
 
 }  // namespace base