Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3442)

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 10446068: Merge 139207 - ChromeOS: login: Pass the use-cras option to guest mode. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1132/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_utils.cc
===================================================================
--- chrome/browser/chromeos/login/login_utils.cc (revision 139367)
+++ chrome/browser/chromeos/login/login_utils.cc (working copy)
@@ -74,6 +74,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "googleurl/src/gurl.h"
+#include "media/base/media_switches.h"
#include "net/base/network_change_notifier.h"
#include "net/cookies/cookie_monster.h"
#include "net/cookies/cookie_store.h"
@@ -1080,6 +1081,9 @@
ash::switches::kAuraWindowAnimationsDisabled,
switches::kUIEnablePartialSwap,
switches::kUIUseGPUProcess,
+#if defined(USE_CRAS)
+ switches::kUseCras,
+#endif
switches::kUseGL,
switches::kUserDataDir,
#if defined(USE_VIRTUAL_KEYBOARD)
« no previous file with comments | « chrome/browser/chromeos/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698