| 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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 | 739 |
| 740 void BrowserWindowGtk::UserChangedTheme() { | 740 void BrowserWindowGtk::UserChangedTheme() { |
| 741 SetBackgroundColor(); | 741 SetBackgroundColor(); |
| 742 gdk_window_invalidate_rect(GTK_WIDGET(window_)->window, | 742 gdk_window_invalidate_rect(GTK_WIDGET(window_)->window, |
| 743 >K_WIDGET(window_)->allocation, TRUE); | 743 >K_WIDGET(window_)->allocation, TRUE); |
| 744 | 744 |
| 745 toolbar_->UserChangedTheme(); | 745 toolbar_->UserChangedTheme(); |
| 746 GtkThemeProperties properties(browser_->profile()); | 746 GtkThemeProperties properties(browser_->profile()); |
| 747 bookmark_bar_->UserChangedTheme(&properties); | 747 bookmark_bar_->UserChangedTheme(&properties); |
| 748 status_bubble_->UserChangedTheme(&properties); | 748 status_bubble_->UserChangedTheme(&properties); |
| 749 tabstrip_->UserChangedTheme(&properties); |
| 749 } | 750 } |
| 750 | 751 |
| 751 int BrowserWindowGtk::GetExtraRenderViewHeight() const { | 752 int BrowserWindowGtk::GetExtraRenderViewHeight() const { |
| 752 int sum = infobar_container_->TotalHeightOfClosingBars(); | 753 int sum = infobar_container_->TotalHeightOfClosingBars(); |
| 753 if (bookmark_bar_->IsClosing()) | 754 if (bookmark_bar_->IsClosing()) |
| 754 sum += bookmark_bar_->GetHeight(); | 755 sum += bookmark_bar_->GetHeight(); |
| 755 if (download_shelf_.get() && download_shelf_->IsClosing()) { | 756 if (download_shelf_.get() && download_shelf_->IsClosing()) { |
| 756 sum += download_shelf_->GetHeight(); | 757 sum += download_shelf_->GetHeight(); |
| 757 } | 758 } |
| 758 return sum; | 759 return sum; |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1392 *edge = GDK_WINDOW_EDGE_NORTH_EAST; | 1393 *edge = GDK_WINDOW_EDGE_NORTH_EAST; |
| 1393 } else if (y < bounds_.height() - kResizeAreaCornerSize) { | 1394 } else if (y < bounds_.height() - kResizeAreaCornerSize) { |
| 1394 *edge = GDK_WINDOW_EDGE_EAST; | 1395 *edge = GDK_WINDOW_EDGE_EAST; |
| 1395 } else { | 1396 } else { |
| 1396 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; | 1397 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; |
| 1397 } | 1398 } |
| 1398 return true; | 1399 return true; |
| 1399 } | 1400 } |
| 1400 NOTREACHED(); | 1401 NOTREACHED(); |
| 1401 } | 1402 } |
| OLD | NEW |