chrome/installer/util/google_chrome_sxs_distribution.h - Issue 94013004: Add base:: to string16s in chrome/.

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/installer/util/google_chrome_sxs_distribution.h

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: try again Created 7 years 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/installer/util/google_chrome_distribution_dummy.cc ('k') | chrome/installer/util/google_chrome_sxs_distribution.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/google_chrome_sxs_distribution.h

diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h

index 808e6400c9f8e5b9fe3fd4add92677410097e737..c90fba79cda5219cf66165a935e1f0d4b7c521bc 100644

--- a/chrome/installer/util/google_chrome_sxs_distribution.h

+++ b/chrome/installer/util/google_chrome_sxs_distribution.h

@@ -19,25 +19,25 @@

// system level install and setting as default browser.

class GoogleChromeSxSDistribution : public GoogleChromeDistribution {

public:

- virtual string16 GetBaseAppName() OVERRIDE;

- virtual string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE;

+ virtual base::string16 GetBaseAppName() OVERRIDE;

+ virtual base::string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE;

virtual int GetIconIndex(ShortcutType shortcut_type) OVERRIDE;

- virtual string16 GetStartMenuShortcutSubfolder(

+ virtual base::string16 GetStartMenuShortcutSubfolder(

Subfolder subfolder_type) OVERRIDE;

- virtual string16 GetBaseAppId() OVERRIDE;

- virtual string16 GetBrowserProgIdPrefix() OVERRIDE;

- virtual string16 GetBrowserProgIdDesc() OVERRIDE;

- virtual string16 GetInstallSubDir() OVERRIDE;

- virtual string16 GetUninstallRegPath() OVERRIDE;

+ virtual base::string16 GetBaseAppId() OVERRIDE;

+ virtual base::string16 GetBrowserProgIdPrefix() OVERRIDE;

+ virtual base::string16 GetBrowserProgIdDesc() OVERRIDE;

+ virtual base::string16 GetInstallSubDir() OVERRIDE;

+ virtual base::string16 GetUninstallRegPath() OVERRIDE;

virtual DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() OVERRIDE;

- virtual bool GetChromeChannel(string16* channel) OVERRIDE;

+ virtual bool GetChromeChannel(base::string16* channel) OVERRIDE;

virtual bool GetCommandExecuteImplClsid(

- string16* handler_class_uuid) OVERRIDE;

+ base::string16* handler_class_uuid) OVERRIDE;

virtual bool AppHostIsSupported() OVERRIDE;

virtual bool ShouldSetExperimentLabels() OVERRIDE;

virtual bool HasUserExperiments() OVERRIDE;

// returns the channel name for GoogleChromeSxSDistribution

- static string16 ChannelName();

+ static base::string16 ChannelName();

private:

friend class BrowserDistribution;