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

Side by Side Diff: chrome/browser/media_galleries/fileapi/picasa_finder.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/media_galleries/fileapi/picasa_finder.h" 5 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
11 #include "base/base_paths.h" 11 #include "base/base_paths.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/file_util.h" 13 #include "base/files/file_util.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "chrome/common/media_galleries/picasa_types.h" 16 #include "chrome/common/media_galleries/picasa_types.h"
17 #include "components/storage_monitor/storage_info.h" 17 #include "components/storage_monitor/storage_info.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 19
20 #if defined(OS_WIN) 20 #if defined(OS_WIN)
21 #include "base/win/registry.h" 21 #include "base/win/registry.h"
22 #endif 22 #endif
23 23
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 .AppendASCII(kPicasaDatabaseDirName); 109 .AppendASCII(kPicasaDatabaseDirName);
110 #elif defined(OS_MACOSX) 110 #elif defined(OS_MACOSX)
111 return picasa_app_data_path.AppendASCII("Google").AppendASCII("Picasa3") 111 return picasa_app_data_path.AppendASCII("Google").AppendASCII("Picasa3")
112 .AppendASCII(kPicasaDatabaseDirName); 112 .AppendASCII(kPicasaDatabaseDirName);
113 #else 113 #else
114 return base::FilePath(); 114 return base::FilePath();
115 #endif 115 #endif
116 } 116 }
117 117
118 } // namespace picasa 118 } // namespace picasa
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698