mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

2757472: Reland "Reland "[LSC] Remove base::string16 alias""

Browse source 
2757472
This commit is contained in:
John Kleinschmidt 2021-03-16 12:18:45 -04:00
parent 86d23cee40
commit 22d8f22cfb
100 changed files with 417 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shell/browser/browser.h
View file

@ -85,7 +85,7 @@ class Browser : public WindowListObserver {
void ClearRecentDocuments();
// Set the application user model ID.
void SetAppUserModelID(const base::string16& name);
void SetAppUserModelID(const std::u16string& name);
// Remove the default protocol handler registry key
bool RemoveAsDefaultProtocolClient(const std::string& protocol,
@ -99,7 +99,7 @@ class Browser : public WindowListObserver {
bool IsDefaultProtocolClient(const std::string& protocol,
gin::Arguments* args);
base::string16 GetApplicationNameForProtocol(const GURL& url);
std::u16string GetApplicationNameForProtocol(const GURL& url);
#if !defined(OS_LINUX)
// get the name, icon and path for an application
@ -113,10 +113,10 @@ class Browser : public WindowListObserver {
#if defined(OS_WIN)
struct LaunchItem {
base::string16 name;
base::string16 path;
base::string16 scope;
std::vector<base::string16> args;
std::u16string name;
std::u16string path;
std::u16string scope;
std::vector<std::u16string> args;
bool enabled = true;
LaunchItem();
@ -132,13 +132,13 @@ class Browser : public WindowListObserver {
bool restore_state = false;
bool opened_at_login = false;
bool opened_as_hidden = false;
base::string16 path;
std::vector<base::string16> args;
std::u16string path;
std::vector<std::u16string> args;
#if defined(OS_WIN)
// used in browser::setLoginItemSettings
bool enabled = true;
base::string16 name = base::string16();
std::u16string name = std::u16string();
// used in browser::getLoginItemSettings
bool executable_will_launch_at_login = false;
@ -238,9 +238,9 @@ class Browser : public WindowListObserver {
#if defined(OS_WIN)
struct UserTask {
base::FilePath program;
base::string16 arguments;
base::string16 title;
base::string16 description;
std::u16string arguments;
std::u16string title;
std::u16string description;
base::FilePath working_dir;
base::FilePath icon_path;
int icon_index;