summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 22:06:59 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 22:06:59 +0000
commit005ce86e3d487d1e09472852e37da944a5460b25 (patch)
treea3aaf7cac7237cd73b9b5822fb28559e84aff7e7 /chrome/browser/chromeos
parent3151ac24b00937c379303034a08936cc52af9454 (diff)
downloadchromium_src-005ce86e3d487d1e09472852e37da944a5460b25.zip
chromium_src-005ce86e3d487d1e09472852e37da944a5460b25.tar.gz
chromium_src-005ce86e3d487d1e09472852e37da944a5460b25.tar.bz2
Merge 144586 - Pass disable ash notifications to incognito mode
BUG=134923 TEST=Run chrome with --ash-notify-disabled in session_manager_setup.sh; ensure ash notifications are disabled in incognito mode. Review URL: https://chromiumcodereview.appspot.com/10703011 TBR=stevenjb@google.com Review URL: https://chromiumcodereview.appspot.com/10704032 git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@144814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/login/login_utils.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 6dfd1da..1205749 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -753,6 +753,7 @@ std::string LoginUtilsImpl::GetOffTheRecordCommandLine(
ash::switches::kAuraLegacyPowerButton,
ash::switches::kAuraNoShadows,
ash::switches::kAuraPanelManager,
+ ash::switches::kAshNotifyDisabled,
::switches::kUIEnablePartialSwap,
::switches::kUIPrioritizeInGpuProcess,
#if defined(USE_CRAS)