Clean up some ifdefs around Win Aura.

chrome/common/chrome_switches.h

 // Copyright (c) 2012 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.
 
 // Defines all the command-line switches used by Chrome.
 
 #ifndef CHROME_COMMON_CHROME_SWITCHES_H_
 #define CHROME_COMMON_CHROME_SWITCHES_H_
 
 #include "build/build_config.h"
@@ skipping 440 matching lines @@
 extern const char kRelauncherProcess[];
 extern const char kUseMockKeychain[];
 #endif
 
 #if defined(OS_WIN)
 extern const char kEnableProfileShortcutManager[];
 extern const char kForceImmersive[];
 extern const char kForceDesktop[];
 extern const char kPrintRaster[];
 extern const char kRelaunchShortcut[];
+extern const char kViewerConnect[];
+extern const char kViewerLaunchViaAppId[];
 extern const char kWaitForMutex[];
 extern const char kWindows8Search[];
 #endif
 
-#if defined(OS_WIN) && defined(USE_AURA)
-extern const char kViewerConnect[];
-extern const char kViewerLaunchViaAppId[];
-#endif
-
 #ifndef NDEBUG
 extern const char kFileManagerExtensionPath[];
 extern const char kImageLoaderExtensionPath[];
 #endif
 
 #if defined(GOOGLE_CHROME_BUILD)
 extern const char kDisablePrintPreview[];
 #else
 extern const char kEnablePrintPreview[];
 #endif
 
 // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in
 // alphabetical order, or in one of the ifdefs (also in order in each section).
 
 }  // namespace switches
 
 #endif  // CHROME_COMMON_CHROME_SWITCHES_H_