Rationalize use_aura=1 and use_ash=1 on linux

BUG=236170
TEST=None
R=ben@chromium.org

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

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

5 files changed, 12 insertions, 5 deletions

diff --git a/ash/display/display_change_observer_x11.cc b/ash/display/display_change_observer_x11.cc
index ebf07f2..90047a1 100644
--- a/ash/display/display_change_observer_x11.cc
+++ b/ash/display/display_change_observer_x11.cc
@@ -226,9 +226,11 @@ void DisplayChangeObserverX11::OnDisplayModeChanged() {
 }
 
 void DisplayChangeObserverX11::OnAppTerminating() {
+#if defined(USE_ASH)
   // Stop handling display configuration events once the shutdown
   // process starts. crbug.com/177014.
   Shell::GetInstance()->output_configurator()->Stop();
+#endif
 }
 
 }  // namespace internal
diff --git a/build/all.gyp b/build/all.gyp
index 85dc8a9..fe03d33 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -158,11 +158,15 @@
         }],
         ['use_aura==1', {
           'dependencies': [
-            '../ash/ash.gyp:*',
             '../ui/aura/aura.gyp:*',
             '../ui/oak/oak.gyp:*',
           ],
         }],
+        ['use_ash==1', {
+          'dependencies': [
+            '../ash/ash.gyp:*',
+          ],
+        }],
         ['remoting==1', {
           'dependencies': [
             '../remoting/remoting.gyp:*',
diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc
index fa392e4..33c6d38 100644
--- a/chrome/browser/notifications/message_center_notification_manager.cc
+++ b/chrome/browser/notifications/message_center_notification_manager.cc
@@ -30,9 +30,9 @@ MessageCenterNotificationManager::MessageCenterNotificationManager(
   message_center_->SetDelegate(this);
   message_center_->AddObserver(this);
 
-#if !defined(OS_CHROMEOS)
-  // On Windows, the notification manager owns the tray icon and views.  Other
-  // platforms have global ownership and Create will return NULL.
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  // On Windows and Mac, the notification manager owns the tray icon and views.
+  // Other platforms have global ownership and Create will return NULL.
   tray_.reset(message_center::CreateMessageCenterTray());
 #endif
 }
diff --git a/chrome/browser/ui/app_list/app_list_service_selector.cc b/chrome/browser/ui/app_list/app_list_service_selector.cc
index 60dc94e..7646790 100644
--- a/chrome/browser/ui/app_list/app_list_service_selector.cc
+++ b/chrome/browser/ui/app_list/app_list_service_selector.cc
@@ -34,7 +34,7 @@ AppListService* AppListService::Get() {
   return chrome::GetAppListServiceWin();
 #elif defined(OS_MACOSX)
   return chrome::GetAppListServiceMac();
-#elif defined(OS_CHROMEOS)
+#elif defined(USE_ASH)
   return chrome::GetAppListServiceAsh();
 #else
 #error "ENABLE_APP_LIST defined, but no AppListService available"
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 504d03a..99399eb 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1784,6 +1784,7 @@
           'sources!': [
             'browser/extensions/api/rtc_private/rtc_private_apitest.cc',
             'browser/extensions/api/terminal/terminal_private_apitest.cc',
+            'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
             'test/data/webui/certificate_viewer_dialog_test.js',
             'test/data/webui/certificate_viewer_ui_test-inl.h',
           ],