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

Side by Side Diff: chrome/browser/ui/gtk/gtk_theme_service.cc

Issue 10948037: [gtk] fix theming of content settings bubble (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.h ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/gtk_theme_service.h" 5 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 use_gtk_); 403 use_gtk_);
404 link_buttons_.push_back(link_button); 404 link_buttons_.push_back(link_button);
405 405
406 signals_->Connect(link_button, "destroy", 406 signals_->Connect(link_button, "destroy",
407 G_CALLBACK(OnDestroyChromeLinkButtonThunk), this); 407 G_CALLBACK(OnDestroyChromeLinkButtonThunk), this);
408 408
409 return link_button; 409 return link_button;
410 } 410 }
411 411
412 GtkWidget* GtkThemeService::BuildLabel(const std::string& text, 412 GtkWidget* GtkThemeService::BuildLabel(const std::string& text,
413 GdkColor color) { 413 const GdkColor& color) {
414 GtkWidget* label = gtk_label_new(text.empty() ? NULL : text.c_str()); 414 GtkWidget* label = gtk_label_new(text.empty() ? NULL : text.c_str());
415 if (!use_gtk_) 415 if (!use_gtk_)
416 gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &color); 416 gtk_util::SetLabelColor(label, &color);
417 labels_.insert(std::make_pair(label, color)); 417 labels_.insert(std::make_pair(label, color));
418 418
419 signals_->Connect(label, "destroy", G_CALLBACK(OnDestroyLabelThunk), this); 419 signals_->Connect(label, "destroy", G_CALLBACK(OnDestroyLabelThunk), this);
420 420
421 return label; 421 return label;
422 } 422 }
423 423
424 GtkWidget* GtkThemeService::CreateToolbarSeparator() { 424 GtkWidget* GtkThemeService::CreateToolbarSeparator() {
425 GtkWidget* separator = gtk_vseparator_new(); 425 GtkWidget* separator = gtk_vseparator_new();
426 GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1); 426 GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1);
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 cairo_new_path(cr); 1153 cairo_new_path(cr);
1154 cairo_set_line_width(cr, 1.0); 1154 cairo_set_line_width(cr, 1.0);
1155 cairo_move_to(cr, start_x, allocation.y); 1155 cairo_move_to(cr, start_x, allocation.y);
1156 cairo_line_to(cr, start_x, allocation.y + allocation.height); 1156 cairo_line_to(cr, start_x, allocation.y + allocation.height);
1157 cairo_stroke(cr); 1157 cairo_stroke(cr);
1158 cairo_destroy(cr); 1158 cairo_destroy(cr);
1159 cairo_pattern_destroy(pattern); 1159 cairo_pattern_destroy(pattern);
1160 1160
1161 return TRUE; 1161 return TRUE;
1162 } 1162 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698