OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/gtk/infobars/infobar_gtk.h" | 5 #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/infobars/infobar_tab_helper.h" | 9 #include "chrome/browser/infobars/infobar_tab_helper.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 PaintInfobarBitsOn(sender, event, this); | 254 PaintInfobarBitsOn(sender, event, this); |
255 } | 255 } |
256 | 256 |
257 return FALSE; | 257 return FALSE; |
258 } | 258 } |
259 | 259 |
260 void InfoBarGtk::PlatformSpecificShow(bool animate) { | 260 void InfoBarGtk::PlatformSpecificShow(bool animate) { |
261 gtk_widget_show_all(widget_.get()); | 261 gtk_widget_show_all(widget_.get()); |
262 gtk_widget_set_size_request(widget_.get(), -1, bar_height()); | 262 gtk_widget_set_size_request(widget_.get(), -1, bar_height()); |
263 | 263 |
264 if (bg_box_->window) | 264 GdkWindow* gdk_window = gtk_widget_get_window(bg_box_); |
265 gdk_window_lower(bg_box_->window); | 265 if (gdk_window) |
| 266 gdk_window_lower(gdk_window); |
266 } | 267 } |
267 | 268 |
268 void InfoBarGtk::PlatformSpecificOnCloseSoon() { | 269 void InfoBarGtk::PlatformSpecificOnCloseSoon() { |
269 // We must close all menus and prevent any signals from being emitted while | 270 // We must close all menus and prevent any signals from being emitted while |
270 // we are animating the info bar closed. | 271 // we are animating the info bar closed. |
271 menu_.reset(); | 272 menu_.reset(); |
272 menu_model_.reset(); | 273 menu_model_.reset(); |
273 signals_.reset(); | 274 signals_.reset(); |
274 } | 275 } |
275 | 276 |
(...skipping 11 matching lines...) Expand all Loading... |
287 const content::NotificationSource& source, | 288 const content::NotificationSource& source, |
288 const content::NotificationDetails& details) { | 289 const content::NotificationDetails& details) { |
289 UpdateBorderColor(); | 290 UpdateBorderColor(); |
290 } | 291 } |
291 | 292 |
292 void InfoBarGtk::OnChildSizeRequest(GtkWidget* expanded, | 293 void InfoBarGtk::OnChildSizeRequest(GtkWidget* expanded, |
293 GtkWidget* child, | 294 GtkWidget* child, |
294 GtkRequisition* requisition) { | 295 GtkRequisition* requisition) { |
295 requisition->height = -1; | 296 requisition->height = -1; |
296 } | 297 } |
OLD | NEW |