Get use_aura=1 and use_aura=1 use_ash=1 building on linux

Rationalize use_aura=1 and use_ash=1 on linux

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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=197363

[Ben Goodger (Google), 2013-04-29 23:32:42]

lgtm


On Mon, Apr 29, 2013 at 4:16 PM, <davemoore@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Rationalize use_aura=1 and use_ash=1 on linux
>
> BUG=236170
> TEST=None
>
> Please review this at
https://codereview.chromium.**org/14554002/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M ash/display/display_change_**observer_x11.cc
>   M build/all.gyp
>   M chrome/browser/notifications/**message_center_notification_**
> manager.cc
>   M chrome/browser/ui/app_list/**app_list_service_selector.cc
>   M chrome/chrome_tests.gypi
>
>
> Index: ash/display/display_change_**observer_x11.cc
> diff --git a/ash/display/display_change_**observer_x11.cc
> b/ash/display/display_change_**observer_x11.cc
> index ebf07f219a9a1960af5e52e28913f8**901a640a14..**
> 90047a1716a9d646226c4f715a4514**467662a8ae 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
> Index: build/all.gyp
> diff --git a/build/all.gyp b/build/all.gyp
> index 85dc8a94e499241f6e6bc4cbae6257**a49b9ea8f4..**
> fe03d33c2ae8aa3722155c7f06b4ae**63760ed842 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:*',
> Index: chrome/browser/notifications/**message_center_notification_**
> manager.cc
> diff --git
a/chrome/browser/**notifications/message_center_**notification_manager.cc
> b/chrome/browser/**notifications/message_center_**notification_manager.cc
> index 1905b829908e0a65d5853a9f37141b**d043d80ef1..**
> 01ffa5a8429b6ea9db78e39e01d415**5e4e49a9d5 100644
> --- a/chrome/browser/**notifications/message_center_**
> notification_manager.cc
> +++ b/chrome/browser/**notifications/message_center_**
> notification_manager.cc
> @@ -29,9 +29,9 @@ MessageCenterNotificationManag**er::**
> MessageCenterNotificationManag**er(
>    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
>  }
> Index: chrome/browser/ui/app_list/**app_list_service_selector.cc
> 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 60dc94ef08ce73d70acf3b8cb7feb4**834a57ac7b..**
> 764679097b7eb5f8ff8e9903c5fa09**6ade388fe7 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"
> Index: chrome/chrome_tests.gypi
> diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
> index db677e0ebaac6b30a05eb3d1a2dbd3**d9225707fd..**
> e284ce7c6df427963b4ddf038155e8**6e07f2fe41 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',
>            ],
>
>
>

[DaveMoore, 2013-04-30 14:48:48]

Committed patchset #2 manually as r197363 (presubmit successful).