summaryrefslogtreecommitdiffstats
path: root/chrome/common/logging_chrome.cc
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-05 05:54:49 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-05 05:54:49 +0000
commit82b67fce95967c0f5e0e9b1537e4a97ca906b3d3 (patch)
tree08ec2cb51158167cb5e5763b54f06f64aa817b77 /chrome/common/logging_chrome.cc
parent9eb6a9c6a365092936d1dbaf6c239faf949930ec (diff)
downloadchromium_src-82b67fce95967c0f5e0e9b1537e4a97ca906b3d3.zip
chromium_src-82b67fce95967c0f5e0e9b1537e4a97ca906b3d3.tar.gz
chromium_src-82b67fce95967c0f5e0e9b1537e4a97ca906b3d3.tar.bz2
Revert 192504 "Re-apply 192420: Move login switches to src/chromeos"
> 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 TBR=stevenjb@chromium.org Review URL: https://codereview.chromium.org/13590004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/logging_chrome.cc')
-rw-r--r--chrome/common/logging_chrome.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index 9095873..896cc7b 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -51,10 +51,6 @@
#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"
@@ -209,7 +205,7 @@ base::FilePath GetSessionLogFile(const CommandLine& command_line) {
} else {
PathService::Get(chrome::DIR_USER_DATA, &log_dir);
base::FilePath login_profile =
- command_line.GetSwitchValuePath(chromeos::switches::kLoginProfile);
+ command_line.GetSwitchValuePath(switches::kLoginProfile);
log_dir = log_dir.Append(login_profile);
}
return log_dir.Append(GetLogFileName().BaseName());
@@ -272,7 +268,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(chromeos::switches::kGuestSession))
+ if (command_line.HasSwitch(switches::kGuestSession))
log_path = GetSessionLogFile(command_line);
// On ChromeOS we log to the symlink. We force creation of a new