| 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 "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 759 void BrowserWindowGtk::UserChangedTheme() { | 759 void BrowserWindowGtk::UserChangedTheme() { |
| 760 SetBackgroundColor(); | 760 SetBackgroundColor(); |
| 761 gdk_window_invalidate_rect(GTK_WIDGET(window_)->window, | 761 gdk_window_invalidate_rect(GTK_WIDGET(window_)->window, |
| 762 >K_WIDGET(window_)->allocation, TRUE); | 762 >K_WIDGET(window_)->allocation, TRUE); |
| 763 | 763 |
| 764 toolbar_->UserChangedTheme(); | 764 toolbar_->UserChangedTheme(); |
| 765 GtkThemeProperties properties(browser_->profile()); | 765 GtkThemeProperties properties(browser_->profile()); |
| 766 bookmark_bar_->UserChangedTheme(&properties); | 766 bookmark_bar_->UserChangedTheme(&properties); |
| 767 status_bubble_->UserChangedTheme(&properties); | 767 status_bubble_->UserChangedTheme(&properties); |
| 768 tabstrip_->UserChangedTheme(&properties); | 768 tabstrip_->UserChangedTheme(&properties); |
| 769 if (download_shelf_.get()) { |
| 770 download_shelf_->UserChangedTheme(&properties); |
| 771 } |
| 769 } | 772 } |
| 770 | 773 |
| 771 int BrowserWindowGtk::GetExtraRenderViewHeight() const { | 774 int BrowserWindowGtk::GetExtraRenderViewHeight() const { |
| 772 int sum = infobar_container_->TotalHeightOfClosingBars(); | 775 int sum = infobar_container_->TotalHeightOfClosingBars(); |
| 773 if (bookmark_bar_->IsClosing()) | 776 if (bookmark_bar_->IsClosing()) |
| 774 sum += bookmark_bar_->GetHeight(); | 777 sum += bookmark_bar_->GetHeight(); |
| 775 if (download_shelf_.get() && download_shelf_->IsClosing()) { | 778 if (download_shelf_.get() && download_shelf_->IsClosing()) { |
| 776 sum += download_shelf_->GetHeight(); | 779 sum += download_shelf_->GetHeight(); |
| 777 } | 780 } |
| 778 return sum; | 781 return sum; |
| (...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1441 *edge = GDK_WINDOW_EDGE_NORTH_EAST; | 1444 *edge = GDK_WINDOW_EDGE_NORTH_EAST; |
| 1442 } else if (y < bounds_.height() - kResizeAreaCornerSize) { | 1445 } else if (y < bounds_.height() - kResizeAreaCornerSize) { |
| 1443 *edge = GDK_WINDOW_EDGE_EAST; | 1446 *edge = GDK_WINDOW_EDGE_EAST; |
| 1444 } else { | 1447 } else { |
| 1445 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; | 1448 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; |
| 1446 } | 1449 } |
| 1447 return true; | 1450 return true; |
| 1448 } | 1451 } |
| 1449 NOTREACHED(); | 1452 NOTREACHED(); |
| 1450 } | 1453 } |
| OLD | NEW |