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

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

Issue 6904160: Implement new gray mock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review nits Created 9 years, 7 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 } 596 }
597 597
598 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 598 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
599 static GdkPixbuf* default_bookmark_icon_ = rb.GetPixbufNamed( 599 static GdkPixbuf* default_bookmark_icon_ = rb.GetPixbufNamed(
600 IDR_DEFAULT_FAVICON); 600 IDR_DEFAULT_FAVICON);
601 return default_bookmark_icon_; 601 return default_bookmark_icon_;
602 } 602 }
603 603
604 // static 604 // static
605 bool GtkThemeService::DefaultUsesSystemTheme() { 605 bool GtkThemeService::DefaultUsesSystemTheme() {
606 #if defined(OS_CHROMEOS)
607 return false;
608 #else
606 scoped_ptr<base::Environment> env(base::Environment::Create()); 609 scoped_ptr<base::Environment> env(base::Environment::Create());
607 610
608 switch (base::nix::GetDesktopEnvironment(env.get())) { 611 switch (base::nix::GetDesktopEnvironment(env.get())) {
609 case base::nix::DESKTOP_ENVIRONMENT_GNOME: 612 case base::nix::DESKTOP_ENVIRONMENT_GNOME:
610 case base::nix::DESKTOP_ENVIRONMENT_XFCE: 613 case base::nix::DESKTOP_ENVIRONMENT_XFCE:
611 return true; 614 return true;
612 default: 615 default:
613 return false; 616 return false;
614 } 617 }
618 #endif
615 } 619 }
616 620
617 void GtkThemeService::ClearAllThemeData() { 621 void GtkThemeService::ClearAllThemeData() {
618 colors_.clear(); 622 colors_.clear();
619 tints_.clear(); 623 tints_.clear();
620 624
621 ThemeService::ClearAllThemeData(); 625 ThemeService::ClearAllThemeData();
622 } 626 }
623 627
624 void GtkThemeService::LoadThemePrefs() { 628 void GtkThemeService::LoadThemePrefs() {
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 cairo_set_line_width(cr, 1.0); 1138 cairo_set_line_width(cr, 1.0);
1135 cairo_move_to(cr, start_x, widget->allocation.y); 1139 cairo_move_to(cr, start_x, widget->allocation.y);
1136 cairo_line_to(cr, start_x, 1140 cairo_line_to(cr, start_x,
1137 widget->allocation.y + widget->allocation.height); 1141 widget->allocation.y + widget->allocation.height);
1138 cairo_stroke(cr); 1142 cairo_stroke(cr);
1139 cairo_destroy(cr); 1143 cairo_destroy(cr);
1140 cairo_pattern_destroy(pattern); 1144 cairo_pattern_destroy(pattern);
1141 1145
1142 return TRUE; 1146 return TRUE;
1143 } 1147 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/window_switcher_button.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698