| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/gtk/browser_window_gtk.h" | 5 #include "chrome/browser/gtk/browser_window_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <X11/XF86keysym.h> | 8 #include <X11/XF86keysym.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { | 846 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { |
| 847 gtk_accel_group_disconnect_key(accel_group_, | 847 gtk_accel_group_disconnect_key(accel_group_, |
| 848 kAcceleratorMap[i].keyval, | 848 kAcceleratorMap[i].keyval, |
| 849 kAcceleratorMap[i].modifier_type); | 849 kAcceleratorMap[i].modifier_type); |
| 850 } | 850 } |
| 851 gtk_window_remove_accel_group(window_, accel_group_); | 851 gtk_window_remove_accel_group(window_, accel_group_); |
| 852 g_object_unref(accel_group_); | 852 g_object_unref(accel_group_); |
| 853 accel_group_ = NULL; | 853 accel_group_ = NULL; |
| 854 } | 854 } |
| 855 | 855 |
| 856 // Cancel any pending callback from the window configure debounce timer. |
| 857 window_configure_debounce_timer_.Stop(); |
| 858 |
| 856 GtkWidget* window = GTK_WIDGET(window_); | 859 GtkWidget* window = GTK_WIDGET(window_); |
| 857 // To help catch bugs in any event handlers that might get fired during the | 860 // To help catch bugs in any event handlers that might get fired during the |
| 858 // destruction, set window_ to NULL before any handlers will run. | 861 // destruction, set window_ to NULL before any handlers will run. |
| 859 window_ = NULL; | 862 window_ = NULL; |
| 860 titlebar_->set_window(NULL); | 863 titlebar_->set_window(NULL); |
| 861 gtk_widget_destroy(window); | 864 gtk_widget_destroy(window); |
| 862 | 865 |
| 863 #if defined(OS_CHROMEOS) | 866 #if defined(OS_CHROMEOS) |
| 864 if (panel_controller_) { | 867 if (panel_controller_) { |
| 865 panel_controller_->Close(); | 868 panel_controller_->Close(); |
| (...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2208 // special-case the ones where the custom frame should be used. These names | 2211 // special-case the ones where the custom frame should be used. These names |
| 2209 // are taken from the WMs' source code. | 2212 // are taken from the WMs' source code. |
| 2210 return (wm_name == "Blackbox" || | 2213 return (wm_name == "Blackbox" || |
| 2211 wm_name == "compiz" || | 2214 wm_name == "compiz" || |
| 2212 wm_name == "e16" || // Enlightenment DR16 | 2215 wm_name == "e16" || // Enlightenment DR16 |
| 2213 wm_name == "KWin" || | 2216 wm_name == "KWin" || |
| 2214 wm_name == "Metacity" || | 2217 wm_name == "Metacity" || |
| 2215 wm_name == "Openbox" || | 2218 wm_name == "Openbox" || |
| 2216 wm_name == "Xfwm4"); | 2219 wm_name == "Xfwm4"); |
| 2217 } | 2220 } |
| OLD | NEW |