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 699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 gfx::NativeWindow parent_window) { | 710 gfx::NativeWindow parent_window) { |
711 NOTIMPLEMENTED(); | 711 NOTIMPLEMENTED(); |
712 } | 712 } |
713 | 713 |
714 void BrowserWindowGtk::UserChangedTheme() { | 714 void BrowserWindowGtk::UserChangedTheme() { |
715 SetBackgroundColor(); | 715 SetBackgroundColor(); |
716 gdk_window_invalidate_rect(GTK_WIDGET(window_)->window, | 716 gdk_window_invalidate_rect(GTK_WIDGET(window_)->window, |
717 >K_WIDGET(window_)->allocation, TRUE); | 717 >K_WIDGET(window_)->allocation, TRUE); |
718 | 718 |
719 toolbar_->UserChangedTheme(); | 719 toolbar_->UserChangedTheme(); |
720 bookmark_bar_->UserChangedTheme(browser_->profile()); | 720 GtkThemeProperties properties(browser_->profile()); |
| 721 bookmark_bar_->UserChangedTheme(&properties); |
721 } | 722 } |
722 | 723 |
723 int BrowserWindowGtk::GetExtraRenderViewHeight() const { | 724 int BrowserWindowGtk::GetExtraRenderViewHeight() const { |
724 int sum = infobar_container_->TotalHeightOfClosingBars(); | 725 int sum = infobar_container_->TotalHeightOfClosingBars(); |
725 if (bookmark_bar_->IsClosing()) | 726 if (bookmark_bar_->IsClosing()) |
726 sum += bookmark_bar_->GetHeight(); | 727 sum += bookmark_bar_->GetHeight(); |
727 if (download_shelf_.get() && download_shelf_->IsClosing()) { | 728 if (download_shelf_.get() && download_shelf_->IsClosing()) { |
728 sum += download_shelf_->GetHeight(); | 729 sum += download_shelf_->GetHeight(); |
729 } | 730 } |
730 return sum; | 731 return sum; |
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1349 *edge = GDK_WINDOW_EDGE_NORTH_EAST; | 1350 *edge = GDK_WINDOW_EDGE_NORTH_EAST; |
1350 } else if (y < bounds_.height() - kResizeAreaCornerSize) { | 1351 } else if (y < bounds_.height() - kResizeAreaCornerSize) { |
1351 *edge = GDK_WINDOW_EDGE_EAST; | 1352 *edge = GDK_WINDOW_EDGE_EAST; |
1352 } else { | 1353 } else { |
1353 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; | 1354 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; |
1354 } | 1355 } |
1355 return true; | 1356 return true; |
1356 } | 1357 } |
1357 NOTREACHED(); | 1358 NOTREACHED(); |
1358 } | 1359 } |
OLD | NEW |