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

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

Issue 1764003002: Remove COLOR_STATUS_BAR_TEXT. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor); 885 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
886 886
887 colors_[ThemeProperties::COLOR_CONTROL_BACKGROUND] = toolbar_color; 887 colors_[ThemeProperties::COLOR_CONTROL_BACKGROUND] = toolbar_color;
888 colors_[ThemeProperties::COLOR_TOOLBAR] = toolbar_color; 888 colors_[ThemeProperties::COLOR_TOOLBAR] = toolbar_color;
889 889
890 colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] = 890 colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] =
891 color_utils::DeriveDefaultIconColor(label_color); 891 color_utils::DeriveDefaultIconColor(label_color);
892 892
893 colors_[ThemeProperties::COLOR_TAB_TEXT] = label_color; 893 colors_[ThemeProperties::COLOR_TAB_TEXT] = label_color;
894 colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = label_color; 894 colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = label_color;
895 colors_[ThemeProperties::COLOR_STATUS_BAR_TEXT] = label_color;
896 895
897 UpdateDefaultFont(); 896 UpdateDefaultFont();
898 897
899 // Build the various icon tints. 898 // Build the various icon tints.
900 GetNormalButtonTintHSL(&button_tint_); 899 GetNormalButtonTintHSL(&button_tint_);
901 GetNormalEntryForegroundHSL(&entry_tint_); 900 GetNormalEntryForegroundHSL(&entry_tint_);
902 GetSelectedEntryForegroundHSL(&selected_entry_tint_); 901 GetSelectedEntryForegroundHSL(&selected_entry_tint_);
903 SkColor frame_color = BuildFrameColors(); 902 SkColor frame_color = BuildFrameColors();
904 903
905 if (ui::MaterialDesignController::IsModeMaterial()) { 904 if (ui::MaterialDesignController::IsModeMaterial()) {
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 // Blacklist scaling factors <130% (crbug.com/484400) and round 1378 // Blacklist scaling factors <130% (crbug.com/484400) and round
1380 // to 1 decimal to prevent rendering problems (crbug.com/485183). 1379 // to 1 decimal to prevent rendering problems (crbug.com/485183).
1381 return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10; 1380 return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10;
1382 } 1381 }
1383 1382
1384 } // namespace libgtk2ui 1383 } // namespace libgtk2ui
1385 1384
1386 views::LinuxUI* BuildGtk2UI() { 1385 views::LinuxUI* BuildGtk2UI() {
1387 return new libgtk2ui::Gtk2UI; 1386 return new libgtk2ui::Gtk2UI;
1388 } 1387 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698