Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: chrome/browser/gtk/browser_window_gtk.cc

Issue 155108: GTK Themes: Set the text color of bookmark buttons to theme color. (Closed)
Patch Set: Simplify. Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/gtk/bookmark_utils_gtk.cc ('k') | chrome/browser/gtk/gtk_theme_provider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 &GTK_WIDGET(window_)->allocation, TRUE); 717 &GTK_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
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 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/bookmark_utils_gtk.cc ('k') | chrome/browser/gtk/gtk_theme_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698