chrome/browser/shell_integration_win.cc - Issue 517054: Remove all uses of EmptyString16(), EmptyWString(), and EmptyGURL(), and thei...

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/shell_integration_win.cc

Issue 517054: Remove all uses of EmptyString16(), EmptyWString(), and EmptyGURL(), and thei... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years, 11 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/safe_browsing/safe_browsing_blocking_page_unittest.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/shell_integration_win.cc

===================================================================

--- chrome/browser/shell_integration_win.cc (revision 35729)

+++ chrome/browser/shell_integration_win.cc (working copy)

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -36,7 +36,7 @@

std::wstring GetProfileIdFromPath(const FilePath& profile_path) {

// Return empty string if profile_path is empty

if (profile_path.empty())

- return EmptyWString();

+ return std::wstring();

FilePath default_user_data_dir;

// Return empty string if profile_path is in default user data

@@ -44,7 +44,7 @@

if (chrome::GetDefaultUserDataDirectory(&default_user_data_dir) &&

profile_path.DirName() == default_user_data_dir &&

profile_path.BaseName().value() == chrome::kNotSignedInProfile)

- return EmptyWString();

+ return std::wstring();

// Get joined basenames of user data dir and profile.

std::wstring basenames = profile_path.DirName().BaseName().value() +