ash: Small fixes for ash_unittests when building in aura.

Two function were hidden under chromeos ifdef, since they are called only on
ChromeOS and one constant were also hidden under chromeos ifdef for the
same reason.

BUG=None
TEST=./build/gyp_chromium -Duse_aura, ninja -C out/Debug ash_unittests
R=jamescook@chromium.org

Review URL: https://codereview.chromium.org/222963003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261476 0039d316-1c4b-4281-b951-d872f2087c98

ash/accelerators/accelerator_controller.cc

@@ -382,11 +382,13 @@ bool HandleScaleUI(bool up) {
   return true;
 }
 
+#if defined(OS_CHROMEOS)
 bool HandleSwapPrimaryDisplay() {
   base::RecordAction(UserMetricsAction("Accel_Swap_Primary_Display"));
   Shell::GetInstance()->display_controller()->SwapPrimaryDisplay();
   return true;
 }
+#endif
 
 bool HandleShowKeyboardOverlay() {
   base::RecordAction(UserMetricsAction("Accel_Show_Keyboard_Overlay"));
@@ -426,6 +428,7 @@ bool HandleShowTaskManager() {
   return true;
 }
 
+#if defined(OS_CHROMEOS)
 void HandleSilenceSpokenFeedback() {
   base::RecordAction(UserMetricsAction("Accel_Silence_Spoken_Feedback"));
 
@@ -435,6 +438,7 @@ void HandleSilenceSpokenFeedback() {
     return;
   delegate->SilenceSpokenFeedback();
 }
+#endif
 
 bool HandleSwitchIme(ImeControlDelegate* ime_control_delegate,
                      const ui::Accelerator& accelerator) {

ash/wm/lock_state_controller.cc

@@ -36,7 +36,9 @@ namespace ash {
 
 namespace {
 
+#if defined(OS_CHROMEOS)
 const int kMaxShutdownSoundDurationMs = 1500;
+#endif
 
 aura::Window* GetBackground() {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();