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

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

Issue 2062353002: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and use SkColorSetA instead of direct bit manipulation Created 4 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
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/libgtk2ui/gtk2_ui.h" 5 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <pango/pango.h> 8 #include <pango/pango.h>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 // regress startup time. Figure out how to do that when we can't access the 895 // regress startup time. Figure out how to do that when we can't access the
896 // prefs system from here. 896 // prefs system from here.
897 897
898 NativeThemeGtk2* theme = NativeThemeGtk2::instance(); 898 NativeThemeGtk2* theme = NativeThemeGtk2::instance();
899 899
900 SkColor toolbar_color = 900 SkColor toolbar_color =
901 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelBackgroundColor); 901 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelBackgroundColor);
902 SkColor label_color = 902 SkColor label_color =
903 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor); 903 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
904 904
905 colors_[ThemeProperties::COLOR_CONTROL_BACKGROUND] = toolbar_color;
906 colors_[ThemeProperties::COLOR_TOOLBAR] = toolbar_color; 905 colors_[ThemeProperties::COLOR_TOOLBAR] = toolbar_color;
907 906
908 colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] = 907 colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] =
909 color_utils::DeriveDefaultIconColor(label_color); 908 color_utils::DeriveDefaultIconColor(label_color);
910 909
911 colors_[ThemeProperties::COLOR_TAB_TEXT] = label_color; 910 colors_[ThemeProperties::COLOR_TAB_TEXT] = label_color;
912 colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = label_color; 911 colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = label_color;
913 912
914 UpdateDefaultFont(); 913 UpdateDefaultFont();
915 914
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 // Blacklist scaling factors <130% (crbug.com/484400) and round 1407 // Blacklist scaling factors <130% (crbug.com/484400) and round
1409 // to 1 decimal to prevent rendering problems (crbug.com/485183). 1408 // to 1 decimal to prevent rendering problems (crbug.com/485183).
1410 return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10; 1409 return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10;
1411 } 1410 }
1412 1411
1413 } // namespace libgtk2ui 1412 } // namespace libgtk2ui
1414 1413
1415 views::LinuxUI* BuildGtk2UI() { 1414 views::LinuxUI* BuildGtk2UI() {
1416 return new libgtk2ui::Gtk2UI; 1415 return new libgtk2ui::Gtk2UI;
1417 } 1416 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698