Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: chrome/browser/ui/browser_command_controller.cc

Issue 10866009: Revert "Fixing crash Crash Report - Stack Signature: content::RenderWidgetHostImpl::ForwardKeybo" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_command_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_command_controller.cc
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index bab1509dd9e8cf4e2cde7cabe829316a9ea90433..8ef341eebff00bfd37a544c5d4cfc7c5120054ff 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -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 @@ void BrowserCommandController::ExecuteCommandWithDisposition(
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_);
@@ -1101,13 +1078,4 @@ 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
« no previous file with comments | « chrome/browser/ui/browser_command_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698