[Cleanup] Remove mac code from aura/ash/views

ui/views/widget/widget.cc

Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 18fd19ee9aeffd9c51685ae111d0affbfd85ecaf..6f1f7cf86f229f82d2291de45104f8d014d12f4b 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -16,6 +16,7 @@
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/focus/view_storage.h"
@@ -31,10 +32,6 @@
 #include "ui/views/window/custom_frame_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
-#if !defined(OS_MACOSX)
-#include "ui/views/controls/menu/menu_controller.h"
-#endif
-
 namespace views {
 
 namespace {
@@ -592,17 +589,6 @@ bool Widget::IsClosed() const {
 void Widget::Show() {
   TRACE_EVENT0("views", "Widget::Show");
   if (non_client_view_) {
-#if defined(OS_MACOSX)
-    // On the Mac the FullScreenBookmarkBar test is different then for any other
-    // OS. Since the new maximize logic from ash does not apply to the mac, we
-    // continue to ignore the fullscreen mode here.
-    if (saved_show_state_ == ui::SHOW_STATE_MAXIMIZED &&
-        !initial_restored_bounds_.IsEmpty()) {
-      native_widget_->ShowMaximizedWithBounds(initial_restored_bounds_);
-    } else {
-      native_widget_->ShowWithWindowState(saved_show_state_);
-    }
-#else
     // While initializing, the kiosk mode will go to full screen before the
     // widget gets shown. In that case we stay in full screen mode, regardless
     // of the |saved_show_state_| member.
@@ -614,7 +600,6 @@ void Widget::Show() {
       native_widget_->ShowWithWindowState(
           IsFullscreen() ? ui::SHOW_STATE_FULLSCREEN : saved_show_state_);
     }
-#endif
     // |saved_show_state_| only applies the first time the window is shown.
     // If we don't reset the value the window may be shown maximized every time
     // it is subsequently shown after being hidden.