chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc - Issue 10836247: Refactor ShellUtil shortcut code -- single multi-purpose methods as opposed to many slighlty diffe…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

Issue 10836247: Refactor ShellUtil shortcut code -- single multi-purpose methods as opposed to many slighlty diffe… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: respect microsoft's definition of correct C++ Created 8 years, 2 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

« no previous file with comments | « chrome/browser/profiles/profile_shortcut_manager_stub.cc ('k') | chrome/browser/profiles/profile_shortcut_manager_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

index 1950d18ea4e14971ec2dfc112d5b61f63db73278..c7531d73da0d644d20f2a93ab9a84b0155588819 100644

--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

@@ -6,6 +6,7 @@

#include "base/message_loop.h"

#include "base/path_service.h"

#include "base/scoped_temp_dir.h"

+#include "base/string16.h"

#include "base/utf_string_conversions.h"

#include "base/test/test_shortcut_win.h"

#include "base/win/shortcut.h"

@@ -32,10 +33,10 @@ namespace {

void GetShortcutPathForProfile(BrowserDistribution* dist,

const string16& profile_name,

FilePath* path) {

- string16 shortcut_name;

- EXPECT_TRUE(ShellUtil::GetDesktopPath(false, path));

- EXPECT_TRUE(ShellUtil::GetChromeShortcutName(dist, false, profile_name,

- &shortcut_name));

+ EXPECT_TRUE(ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_DESKTOP, dist,

+ ShellUtil::CURRENT_USER, path));

+ string16 shortcut_name(

+ ProfileShortcutManager::GetShortcutNameForProfile(profile_name));

*path = path->Append(shortcut_name);

}