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

chrome/browser/ui/browser_command_controller.cc

 // Copyright (c) 2012 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/browser_command_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #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"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_restriction.h"
 #include "content/public/common/url_constants.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 #if defined(OS_WIN)
 #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;
 using content::WebContents;
 
 namespace {
 
 // Returns |true| if entry has an internal chrome:// URL, |false| otherwise.
 bool HasInternalURL(const NavigationEntry* entry) {
   if (!entry)
@@ skipping 219 matching lines @@
       break;
 
      // Window management commands
     case IDC_NEW_WINDOW:
       NewWindow(browser_);
       break;
     case IDC_NEW_INCOGNITO_WINDOW:
       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_);
       break;
     case IDC_SELECT_PREVIOUS_TAB:
       SelectPreviousTab(browser_);
       break;
     case IDC_TABPOSE:
       OpenTabpose(browser_);
       break;
@@ skipping 766 matching lines @@
 }
 
 BrowserWindow* BrowserCommandController::window() {
   return browser_->window();
 }
 
 Profile* BrowserCommandController::profile() {
   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