Re-Re-apply 192420: Move login switches to src/chromeos"
Once more with feeling. This time for sure.
I correctly figured out how to do a GOOGLE_CHROME_BUILD since apparantly
this does not get defined in any of the CQ chromeos bots.
BUG=192420
[email protected], et. al.
Review URL: https://codereview.chromium.org/13730003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192594 0039d316-1c4b-4281-b951-d872f2087c98
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 @@
} 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 @@
// 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