summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/browser_window_gtk.cc
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 05:16:44 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 05:16:44 +0000
commited1bb720731ea7c7644c208da970f0609a7e3b62 (patch)
tree5d66f86a406225f13f3c87485db4e2dbdde688b0 /chrome/browser/ui/gtk/browser_window_gtk.cc
parent8dc0d4052bbc6e023577e372679d471da9717236 (diff)
downloadchromium_src-ed1bb720731ea7c7644c208da970f0609a7e3b62.zip
chromium_src-ed1bb720731ea7c7644c208da970f0609a7e3b62.tar.gz
chromium_src-ed1bb720731ea7c7644c208da970f0609a7e3b62.tar.bz2
Revert Fast tab closure and dependent CL
Revert r205149 (Fast tab closure) and dependent CL r207181 (Move histograms and supporting code that don't belong in content out) since it breaks a bunch of systems. Mechanical revert of problematic CLs, setting NOTRY so we can land this in the face of flaky bots. BUG=142458,156896,249289,246999,246634,248998,250863 TBR=sky@chromium.org,joi@chromium.org,jam@chromium.org NOTRY=True Review URL: https://chromiumcodereview.appspot.com/17487002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index f343c44..16dfc66 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1449,13 +1449,6 @@ bool BrowserWindowGtk::CanClose() const {
// down. When the tab strip is empty we'll be called back again.
gtk_widget_hide(GTK_WIDGET(window_));
browser_->OnWindowClosing();
- browser_->tab_strip_model()->CloseAllTabs();
- return false;
- } else if (!browser_->HasCompletedUnloadProcessing()) {
- // The browser needs to finish running unload handlers.
- // Hide the window (so it appears to have closed immediately), and
- // the browser will call us back again when it is ready to close.
- gtk_widget_hide(GTK_WIDGET(window_));
return false;
}