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

BUG=125106
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10389217

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

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',

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', {

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(