diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 04:34:30 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 04:34:30 +0000 |
| commit | 0ff8bf29ed54ec46b7fc6939dc0a85137573d799 (patch) | |
| tree | 3a60bd2b55f5302b0ff910c9be5b9c3befa75bec /chrome/common/logging_chrome.cc | |
| parent | 8942dc6055c1680c54fdef079905bda5694a8d73 (diff) | |
| download | chromium_src-0ff8bf29ed54ec46b7fc6939dc0a85137573d799.zip chromium_src-0ff8bf29ed54ec46b7fc6939dc0a85137573d799.tar.gz chromium_src-0ff8bf29ed54ec46b7fc6939dc0a85137573d799.tar.bz2 | |
Re-apply 192420: Move login switches to src/chromeos
Includes fix for GOOGLE_CHROME_BUILD
BUG=192420
TBR=ben@chromium.org, nkostylev@google.com
Review URL: https://chromiumcodereview.appspot.com/13671005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/logging_chrome.cc')
| -rw-r--r-- | chrome/common/logging_chrome.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc index 896cc7b..9095873 100644 --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc @@ -51,6 +51,10 @@ #include "chrome/common/env_vars.h" #include "ipc/ipc_logging.h" +#if defined(OS_CHROMEOS) +#include "chromeos/chromeos_switches.h" +#endif + #if defined(OS_WIN) #include <initguid.h> #include "base/logging_win.h" @@ -205,7 +209,7 @@ base::FilePath GetSessionLogFile(const CommandLine& command_line) { } else { PathService::Get(chrome::DIR_USER_DATA, &log_dir); base::FilePath login_profile = - command_line.GetSwitchValuePath(switches::kLoginProfile); + command_line.GetSwitchValuePath(chromeos::switches::kLoginProfile); log_dir = log_dir.Append(login_profile); } return log_dir.Append(GetLogFileName().BaseName()); @@ -268,7 +272,7 @@ void InitChromeLogging(const CommandLine& command_line, // For BWSI (Incognito) logins, we want to put the logs in the user // profile directory that is created for the temporary session instead // of in the system log directory, for privacy reasons. - if (command_line.HasSwitch(switches::kGuestSession)) + if (command_line.HasSwitch(chromeos::switches::kGuestSession)) log_path = GetSessionLogFile(command_line); // On ChromeOS we log to the symlink. We force creation of a new |