| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1116 | 1116 |
| 1117 void BrowserWindowGtk::ShowInstant(TabContents* preview_contents) { | 1117 void BrowserWindowGtk::ShowInstant(TabContents* preview_contents) { |
| 1118 contents_container_->SetPreviewContents(preview_contents); | 1118 contents_container_->SetPreviewContents(preview_contents); |
| 1119 MaybeShowBookmarkBar(false); | 1119 MaybeShowBookmarkBar(false); |
| 1120 | 1120 |
| 1121 TabContents* contents = contents_container_->GetTabContents(); | 1121 TabContents* contents = contents_container_->GetTabContents(); |
| 1122 if (contents) | 1122 if (contents) |
| 1123 contents->CancelInstantFade(); | 1123 contents->CancelInstantFade(); |
| 1124 } | 1124 } |
| 1125 | 1125 |
| 1126 void BrowserWindowGtk::HideInstant() { | 1126 void BrowserWindowGtk::HideInstant(bool instant_is_active) { |
| 1127 contents_container_->PopPreviewContents(); | 1127 contents_container_->PopPreviewContents(); |
| 1128 MaybeShowBookmarkBar(false); | 1128 MaybeShowBookmarkBar(false); |
| 1129 |
| 1130 // TODO(sky): honor instant_is_active. |
| 1129 } | 1131 } |
| 1130 | 1132 |
| 1131 gfx::Rect BrowserWindowGtk::GetInstantBounds() { | 1133 gfx::Rect BrowserWindowGtk::GetInstantBounds() { |
| 1132 return gtk_util::GetWidgetScreenBounds(contents_container_->widget()); | 1134 return gtk_util::GetWidgetScreenBounds(contents_container_->widget()); |
| 1133 } | 1135 } |
| 1134 | 1136 |
| 1135 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() { | 1137 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() { |
| 1136 new DownloadInProgressDialogGtk(browser()); | 1138 new DownloadInProgressDialogGtk(browser()); |
| 1137 } | 1139 } |
| 1138 | 1140 |
| (...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2244 // special-case the ones where the custom frame should be used. These names | 2246 // special-case the ones where the custom frame should be used. These names |
| 2245 // are taken from the WMs' source code. | 2247 // are taken from the WMs' source code. |
| 2246 return (wm_name == "Blackbox" || | 2248 return (wm_name == "Blackbox" || |
| 2247 wm_name == "compiz" || | 2249 wm_name == "compiz" || |
| 2248 wm_name == "e16" || // Enlightenment DR16 | 2250 wm_name == "e16" || // Enlightenment DR16 |
| 2249 wm_name == "Metacity" || | 2251 wm_name == "Metacity" || |
| 2250 wm_name == "Mutter" || | 2252 wm_name == "Mutter" || |
| 2251 wm_name == "Openbox" || | 2253 wm_name == "Openbox" || |
| 2252 wm_name == "Xfwm4"); | 2254 wm_name == "Xfwm4"); |
| 2253 } | 2255 } |
| OLD | NEW |