Aura: Desktop aura is now default on non-chromeos linux builds.

Aura: Desktop aura is now default on non-chromeos linux builds.

BUG=125106
TEST=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=137982

[Elliot Glaysher, 2012-05-18 20:35:58]

ben: review. look at the pretty green trybot! :)

sergeyu: remoting_unittests still aren't linking on aura configurations;
disabling.

pkotwicz: *_aura* files can not depend on ash/ code. Fixed temporarily for
compiling with an ifdef, but this will need to be changed for crbug.com/128578.

[Ben Goodger (Google), 2012-05-18 20:45:57]

LGTM

On Fri, May 18, 2012 at 1:35 PM, <erg@chromium.org> wrote:

> Reviewers: Ben Goodger (Google), sergeyu, pkotwicz,
>
> Message:
> ben: review. look at the pretty green trybot! :)
>
> sergeyu: remoting_unittests still aren't linking on aura configurations;
> disabling.
>
> pkotwicz: *_aura* files can not depend on ash/ code. Fixed temporarily for
> compiling with an ifdef, but this will need to be changed for
> crbug.com/128578.
>
> Description:
> Aura: Desktop aura is now default on non-chromeos linux builds.
>
> BUG=125106
> TEST=none
>
>
> Please review this at
https://chromiumcodereview.**appspot.com/10389217/<https://chromiumcodereview...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M build/all.gyp
>  M build/common.gypi
>  M chrome/browser/ui/views/frame/**app_non_client_frame_view_**aura.cc
>
>
> Index: build/all.gyp
> diff --git a/build/all.gyp b/build/all.gyp
> index 663702ca965c100f5594d6e7d41ab6**7811d84b88..**
> 9e28399810b9634bfc27ef69c271a2**a8372e2a02 100644
> --- a/build/all.gyp
> +++ b/build/all.gyp
> @@ -550,7 +550,6 @@
>             '../chrome/chrome.gyp:chrome',
>             '../chrome/chrome.gyp:**interactive_ui_tests',
>             '../chrome/chrome.gyp:unit_**tests',
> -            '../remoting/remoting.gyp:**remoting_unittests',
>             '../ui/aura/aura.gyp:*',
>             '../ui/compositor/compositor.**gyp:*',
>             '../ui/ui.gyp:gfx_unittests',
> Index: build/common.gypi
> diff --git a/build/common.gypi b/build/common.gypi
> index c2618d1a8c2a62e05bd648e9c7cda8**4b41a6e455..**
> e8467155007b810bfcb0e8c71d5f7d**5251f974bb 100644
> --- a/build/common.gypi
> +++ b/build/common.gypi
> @@ -98,7 +98,7 @@
>           # imply using ash. This rule should be removed for the future
> when
>           # both Linux and Windows are using the aura windows without the
> ash
>           # interface.
> -          ['use_aura==1 and ((OS=="linux" and chromeos==0) or
> OS=="win")', {
> +          ['use_aura==1 and OS=="win"', {
>             'use_ash%': 1,
>           }],
>           ['use_ash==1', {
> Index: chrome/browser/ui/views/frame/**app_non_client_frame_view_**aura.cc
> diff --git
a/chrome/browser/ui/views/**frame/app_non_client_frame_**view_aura.cc
> b/chrome/browser/ui/views/**frame/app_non_client_frame_**view_aura.cc
> index db807d58f6cea32da2fc24b322c61f**20a383a243..**
> e23cf5f3221ec40f02858cd75ef369**d2553682d7 100644
> --- a/chrome/browser/ui/views/**frame/app_non_client_frame_**view_aura.cc
> +++ b/chrome/browser/ui/views/**frame/app_non_client_frame_**view_aura.cc
> @@ -4,7 +4,6 @@
>
>  #include "chrome/browser/ui/views/**frame/app_non_client_frame_**
> view_aura.h"
>
> -#include "ash/wm/workspace/frame_**maximize_button.h"
>  #include "base/debug/stack_trace.h"
>  #include "chrome/browser/ui/views/**frame/browser_frame.h"
>  #include "chrome/browser/ui/views/**frame/browser_view.h"
> @@ -30,6 +29,10 @@
>  #include "ui/views/widget/widget.h"
>  #include "ui/views/window/non_client_**view.h"
>
> +#if defined(USE_ASH)
> +#include "ash/wm/workspace/frame_**maximize_button.h"
> +#endif
> +
>  namespace {
>  // The number of pixels to use as a hover zone at the top of the screen.
>  const int kTopMargin = 1;
> @@ -51,7 +54,12 @@ class AppNonClientFrameViewAura::**ControlView
>   explicit ControlView(**AppNonClientFrameViewAura* owner) :
>       owner_(owner),
>       close_button_(new views::ImageButton(this)),
> -      restore_button_(new ash::FrameMaximizeButton(this, owner_)) {
> +#if defined(USE_ASH)
> +      restore_button_(new ash::FrameMaximizeButton(this, owner_))
> +#else
> +      restore_button_(new views::ImageButton(this))
> +#endif
> +  {
>     close_button_->**SetAccessibleName(
>         l10n_util::GetStringUTF16(IDS_**ACCNAME_CLOSE));
>     restore_button_->**SetAccessibleName(
>
>
>

[commit-bot: I haz the power, 2012-05-18 21:00:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/erg@chromium.org/10389217/1

[commit-bot: I haz the power, 2012-05-19 00:05:06]

Change committed as 137982