Unified Desktop: hook up ash to allow unified desktop mode

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 6bf50fe06cfd5b3fc26c8eaef795f086e8e82a59..024c87d2cd81f99f59d70245a690f289669ce1af 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -485,9 +485,11 @@ void Shell::RemoveShellObserver(ShellObserver* observer) {
 
 #if defined(OS_CHROMEOS)
 bool Shell::ShouldSaveDisplaySettings() {
+  // TODO(oshima): Allow saving the settings even in unified desktop mode.
   return !(screen_orientation_controller_
                ->ignore_display_configuration_updates() ||
-           resolution_notification_controller_->DoesNotificationTimeout());
+           resolution_notification_controller_->DoesNotificationTimeout()) &&
+         !switches::UnifiedDesktopEnabled();
 }
 #endif