Revert 153205 - Temporarily revert 152729 - Revert "Fixing crash Crash Report - Stack Signature: co…

chrome/browser/ui/browser_command_controller.cc

Index: chrome/browser/ui/browser_command_controller.cc
===================================================================
--- chrome/browser/ui/browser_command_controller.cc	(revision 153210)
+++ chrome/browser/ui/browser_command_controller.cc	(working copy)
@@ -23,7 +23,6 @@
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
-#include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
@@ -44,10 +43,6 @@
 #include "base/win/metro.h"
 #endif
 
-#if defined(USE_ASH)
-#include "ash/wm/window_util.h"
-#endif
-
 using content::WebContents;
 using content::NavigationEntry;
 using content::NavigationController;
@@ -287,31 +282,13 @@
       NewIncognitoWindow(browser_);
       break;
     case IDC_CLOSE_WINDOW:
-      // Destroying a tab / browser window while it has opened a full screen
-      // window will destroy it's content class - which will destroy the
-      // delegate - which is also used by the opened full screen window's
-      // event handler. That will cause then a crash. To avoid that we supress
-      // closing of windows via key stroke while a full screen window is open.
-      // http://crbug.com/134465,  http://crbug.com/131436
-#if defined(OS_CHROMEOS)
-      if (!IsFullScreenWindowOpen())
-#endif
-        CloseWindow(browser_);
+      CloseWindow(browser_);
       break;
     case IDC_NEW_TAB:
       NewTab(browser_);
       break;
     case IDC_CLOSE_TAB:
-      // Destroying a tab / browser window while it has opened a full screen
-      // window will destroy it's content class - which will destroy the
-      // delegate - which is also used by the opened full screen window's
-      // event handler. That will cause then a crash. To avoid that we supress
-      // closing of windows via key stroke while a full screen window is open.
-      // http://crbug.com/134465,  http://crbug.com/131436
-#if defined(OS_CHROMEOS)
-      if (!IsFullScreenWindowOpen())
-#endif
-        CloseTab(browser_);
+      CloseTab(browser_);
       break;
     case IDC_SELECT_NEXT_TAB:
       SelectNextTab(browser_);
@@ -1098,13 +1075,4 @@
   return browser_->profile();
 }
 
-bool BrowserCommandController::IsFullScreenWindowOpen() {
-#if defined(USE_ASH)
-  aura::Window* window = ash::wm::GetActiveWindow();
-  return (window && ash::wm::IsWindowFullscreen(window));
-#else
-  return false;
-#endif
-}
-
 }  // namespace chrome