| Index: chrome/installer/util/auto_launch_util.h
|
| diff --git a/chrome/installer/util/auto_launch_util.h b/chrome/installer/util/auto_launch_util.h
|
| index e5e30c50934e44b3cb67f83716dcc209f51a05c4..65b3ba90e52438181ecff2bd55e3f775ac0b3db2 100644
|
| --- a/chrome/installer/util/auto_launch_util.h
|
| +++ b/chrome/installer/util/auto_launch_util.h
|
| @@ -32,14 +32,14 @@ namespace auto_launch_util {
|
| // words, showing a window trumps not showing a window.
|
| // ALSO NOTE: |application_path| is optional and should be blank in most cases
|
| // (as it will default to the application path of the current executable).
|
| -bool AutoStartRequested(const string16& profile_directory,
|
| +bool AutoStartRequested(const base::string16& profile_directory,
|
| bool window_requested,
|
| const base::FilePath& application_path);
|
|
|
| // Disables all auto-start features. |profile_directory| is the name of the
|
| // directory (leaf, not the full path) that contains the profile that was set
|
| // to be opened at user login.
|
| -void DisableAllAutoStartFeatures(const string16& profile_directory);
|
| +void DisableAllAutoStartFeatures(const base::string16& profile_directory);
|
|
|
| // Configures Chrome to auto-launch at user login and show a window. See also
|
| // EnableBackgroundStartAtLogin, which does the same, except without a window.
|
| @@ -48,7 +48,7 @@ void DisableAllAutoStartFeatures(const string16& profile_directory);
|
| // |application_path| is needed when the caller is not the process being set to
|
| // auto-launch, ie. the installer. This is because |application_path|, if left
|
| // blank, defaults to the application path of the current executable.
|
| -void EnableForegroundStartAtLogin(const string16& profile_directory,
|
| +void EnableForegroundStartAtLogin(const base::string16& profile_directory,
|
| const base::FilePath& application_path);
|
|
|
| // Disables auto-starting Chrome in foreground mode at user login.
|
| @@ -56,7 +56,7 @@ void EnableForegroundStartAtLogin(const string16& profile_directory,
|
| // that contains the profile that was set to be opened at user login.
|
| // NOTE: Chrome may still launch if the other auto-start flavor is active
|
| // (background mode).
|
| -void DisableForegroundStartAtLogin(const string16& profile_directory);
|
| +void DisableForegroundStartAtLogin(const base::string16& profile_directory);
|
|
|
| // Requests that Chrome start in Background Mode at user login (without a
|
| // window being shown, except if EnableForegroundStartAtLogin has also been
|
|
|