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

Unified Diff: chrome/browser/shell_integration_linux.cc

Issue 10958009: Revert 157667 - Add new PathService paths for Windows' All Users Desktop and Quick Launch folders. (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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/shell_integration_linux.cc
===================================================================
--- chrome/browser/shell_integration_linux.cc (revision 157679)
+++ chrome/browser/shell_integration_linux.cc (working copy)
@@ -32,6 +32,7 @@
#include "build/build_config.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
#include "content/public/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
#include "ui/gfx/codec/png_codec.h"
@@ -118,7 +119,7 @@
DCHECK_EQ(shortcut_filename.BaseName().value(), shortcut_filename.value());
FilePath desktop_path;
- if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
+ if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
return false;
int desktop_fd = open(desktop_path.value().c_str(), O_RDONLY | O_DIRECTORY);
@@ -155,7 +156,7 @@
void DeleteShortcutOnDesktop(const FilePath& shortcut_filename) {
FilePath desktop_path;
- if (PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
+ if (PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
file_util::Delete(desktop_path.Append(shortcut_filename), false);
}
@@ -483,7 +484,7 @@
file_util::ReplaceIllegalCharactersInPath(&filename, '_');
FilePath desktop_path;
- if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
+ if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
return FilePath();
FilePath filepath = desktop_path.Append(filename);
« no previous file with comments | « chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc ('k') | chrome/browser/shell_integration_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698