Revert 222226 "App windows with ids should remember fullscreen s..."

trunk/src/chrome/browser/ui/views/apps/native_app_window_views.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/apps/native_app_window_views.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 308 matching lines @@
   return window_->GetNativeWindow();
 }
 
 gfx::Rect NativeAppWindowViews::GetRestoredBounds() const {
   return window_->GetRestoredBounds();
 }
 
 ui::WindowShowState NativeAppWindowViews::GetRestoredState() const {
   if (IsMaximized())
     return ui::SHOW_STATE_MAXIMIZED;
+#if defined(USE_ASH)
+  // On Ash, restore fullscreen.
   if (IsFullscreen())
     return ui::SHOW_STATE_FULLSCREEN;
-#if defined(USE_ASH)
+
   // Use kRestoreShowStateKey in case a window is minimized/hidden.
   ui::WindowShowState restore_state =
       window_->GetNativeWindow()->GetProperty(
           aura::client::kRestoreShowStateKey);
   // Whitelist states to return so that invalid and transient states
   // are not saved and used to restore windows when they are recreated.
   switch (restore_state) {
     case ui::SHOW_STATE_NORMAL:
     case ui::SHOW_STATE_MAXIMIZED:
     case ui::SHOW_STATE_FULLSCREEN:
@@ skipping 442 matching lines @@
 
 void NativeAppWindowViews::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   unhandled_keyboard_event_handler_.HandleKeyboardEvent(event,
                                                         GetFocusManager());
 }
 
 void NativeAppWindowViews::RenderViewHostChanged() {
   OnViewWasResized();
 }