| 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/views/frame/browser_frame_gtk.h" | 5 #include "chrome/browser/views/frame/browser_frame_gtk.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/browser/browser_theme_provider.h" | 8 #include "chrome/browser/browser_theme_provider.h" |
| 9 #include "chrome/browser/profile.h" | 9 #include "chrome/browser/profile.h" |
| 10 #include "chrome/browser/status_bubble.h" | 10 #include "chrome/browser/status_bubble.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 WindowGtk::IsMaximized(); | 148 WindowGtk::IsMaximized(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 bool BrowserFrameGtk::GetAccelerator(int cmd_id, | 151 bool BrowserFrameGtk::GetAccelerator(int cmd_id, |
| 152 menus::Accelerator* accelerator) { | 152 menus::Accelerator* accelerator) { |
| 153 return browser_view_->GetAccelerator(cmd_id, accelerator); | 153 return browser_view_->GetAccelerator(cmd_id, accelerator); |
| 154 } | 154 } |
| 155 | 155 |
| 156 gboolean BrowserFrameGtk::OnWindowStateEvent(GtkWidget* widget, | 156 gboolean BrowserFrameGtk::OnWindowStateEvent(GtkWidget* widget, |
| 157 GdkEventWindowState* event) { | 157 GdkEventWindowState* event) { |
| 158 bool was_full_screen = IsFullscreen(); |
| 158 gboolean result = views::WindowGtk::OnWindowStateEvent(widget, event); | 159 gboolean result = views::WindowGtk::OnWindowStateEvent(widget, event); |
| 159 if ((!IsVisible() || IsMinimized()) && browser_view_->GetStatusBubble()) { | 160 if ((!IsVisible() || IsMinimized()) && browser_view_->GetStatusBubble()) { |
| 160 // The window is effectively hidden. We have to hide the status bubble as | 161 // The window is effectively hidden. We have to hide the status bubble as |
| 161 // unlike windows gtk has no notion of child windows that are hidden along | 162 // unlike windows gtk has no notion of child windows that are hidden along |
| 162 // with the parent. | 163 // with the parent. |
| 163 browser_view_->GetStatusBubble()->Hide(); | 164 browser_view_->GetStatusBubble()->Hide(); |
| 164 } | 165 } |
| 166 if (was_full_screen != IsFullscreen()) |
| 167 browser_view_->FullScreenStateChanged(); |
| 165 return result; | 168 return result; |
| 166 } | 169 } |
| 167 | 170 |
| 168 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget, | 171 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget, |
| 169 GdkEventConfigure* event) { | 172 GdkEventConfigure* event) { |
| 170 browser_view_->WindowMoved(); | 173 browser_view_->WindowMoved(); |
| 171 return views::WindowGtk::OnConfigureEvent(widget, event); | 174 return views::WindowGtk::OnConfigureEvent(widget, event); |
| 172 } | 175 } |
| OLD | NEW |