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

chrome/common/chrome_switches.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 1101 matching lines @@
 
 // Enables overriding the path for the default authentication extension.
 const char kAuthExtensionPath[]             = "auth-ext-path";
 
 // Enables archive file (zip) handling in file manager.
 const char kEnableArchives[]                = "enable-archives";
 
 #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
 // dumping and reporting, because helpers cannot access the profile or other
 // files needed to make this decision.
 const char kEnableCrashReporter[]           = "enable-crash-reporter";
 
 // Bypass the error dialog when the profile lock couldn't be attained.
 // This switch is used during automated testing.
 const char kNoProcessSingletonDialog[]      = "no-process-singleton-dialog";
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
 // 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 ).
 const char kEnableExposeForTabs[]           = "enable-expose-for-tabs";
 
 // A process type (switches::kProcessType) that relaunches the browser. See
 // chrome/browser/mac/relauncher.h.
 const char kRelauncherProcess[]             = "relauncher";
 
 // Use mock keychain for testing purposes, which prevents blocking dialogs from
@@ skipping 46 matching lines @@
 const char kSetToken[]                      = "set-token";
 
 // Debug only switch to specify which websocket live experiment host to be used.
 // If host is specified, it also makes initial delay shorter (5 min to 5 sec)
 // to make it faster to test websocket live experiment code.
 const char kWebSocketLiveExperimentHost[]   = "websocket-live-experiment-host";
 
 // 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";
-
-// Enables overriding the path of file manager extension.
-const char kFileManagerExtensionPath[]      = "filemgr-ext-path";
-#endif  // NDEBUG
+#endif
 
 // Disable print preview (Not exposed via about:flags. Only used for testing.)
 const char kDisablePrintPreview[]           = "disable-print-preview";
 
 // Enable print preview (no PDF viewer, thus not supported with Chromium).
 // kDisablePrintPreview overrides this.
 const char kEnablePrintPreview[]            = "enable-print-preview";
 
 // Enables the benchmarking extensions.
 const char kEnableBenchmarking[]            = "enable-benchmarking";
@@ skipping 11 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead,
 // please put them in alphabetical order above, or in order inside the
 // appropriate ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches