Revert 102113 - Aura: Use extension-based file picker from CrOS for pure-views builds.

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 102115)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -1119,9 +1119,12 @@
 #ifndef NDEBUG
 // Skips all other OOBE pages after user login.
 const char kOobeSkipPostLogin[]             = "oobe-skip-postlogin";
-#endif  // NDEBUG
-#endif  // OS_CHROMEOS
 
+// Enables overriding the path off file manager extension.
+const char kFileManagerExtensionPath[]      = "filemgr-ext-path";
+#endif
+#endif
+
 #if defined(OS_POSIX)
 // A flag, generated internally by Chrome for renderer and other helper process
 // command lines on Linux and Mac.  It tells the helper process to enable crash
@@ -1137,7 +1140,7 @@
 // Specifies which password store to use (detect, default, gnome, kwallet).
 const char kPasswordStore[]                 = "password-store";
 #endif
-#endif  // OS_POSIX
+#endif
 
 #if defined(OS_MACOSX)
 // Enables the tabs expose feature ( http://crbug.com/50307 ).
@@ -1204,11 +1207,8 @@
 // Debug only switch to give access to all private extension APIs to
 // any non-component extension that is requesting it.
 const char kExposePrivateExtensionApi[]   = "expose-private-extension-api";
+#endif
 
-// Enables overriding the path of file manager extension.
-const char kFileManagerExtensionPath[]      = "filemgr-ext-path";
-#endif  // NDEBUG
-
 // Disable print preview (Not exposed via about:flags. Only used for testing.)
 const char kDisablePrintPreview[]           = "disable-print-preview";
 
Property changes on: chrome/common/chrome_switches.cc
___________________________________________________________________
Deleted: svn:mergeinfo