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

Side by Side Diff: chrome/browser/ui/libgtkui/gtk_ui.cc

Issue 2629293002: Try to improve toolbar separator coloration for themed browser windows. (Closed)
Patch Set: revert Created 3 years, 11 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/libgtkui/gtk_ui.h" 5 #include "chrome/browser/ui/libgtkui/gtk_ui.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <pango/pango.h> 8 #include <pango/pango.h>
9 #include <X11/Xcursor/Xcursor.h> 9 #include <X11/Xcursor/Xcursor.h>
10 10
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 colors_[ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND] = 842 colors_[ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND] =
843 toolbar_color; 843 toolbar_color;
844 colors_[ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT] = 844 colors_[ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT] =
845 GetFgColor("GtkToolbar#toolbar GtkLabel#label"); 845 GetFgColor("GtkToolbar#toolbar GtkLabel#label");
846 // Separates the toolbar from the bookmark bar or butter bars. 846 // Separates the toolbar from the bookmark bar or butter bars.
847 colors_[ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR] = 847 colors_[ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR] =
848 toolbar_separator_horizontal; 848 toolbar_separator_horizontal;
849 // Separates entries in the downloads bar. 849 // Separates entries in the downloads bar.
850 colors_[ThemeProperties::COLOR_TOOLBAR_VERTICAL_SEPARATOR] = 850 colors_[ThemeProperties::COLOR_TOOLBAR_VERTICAL_SEPARATOR] =
851 toolbar_separator_vertical; 851 toolbar_separator_vertical;
852 // Separates the bookmark bar from the web content.
853 colors_[ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR] =
854 toolbar_separator_horizontal;
855 852
856 // These colors represent the border drawn around tabs and between 853 // These colors represent the border drawn around tabs and between
857 // the tabstrip and toolbar. It's unclear if the selectors used are 854 // the tabstrip and toolbar. It's unclear if the selectors used are
858 // correct, but they seem to give reasonable results. 855 // correct, but they seem to give reasonable results.
859 SkColor entry_border = 856 SkColor entry_border =
860 GetBorderColor("#headerbar.header-bar.titlebar GtkEntry#entry"); 857 GetBorderColor("#headerbar.header-bar.titlebar GtkEntry#entry");
861 SkColor entry_inactive_border = 858 SkColor entry_inactive_border =
862 GetBorderColor("#headerbar.header-bar.titlebar:backdrop GtkEntry#entry"); 859 GetBorderColor("#headerbar.header-bar.titlebar:backdrop GtkEntry#entry");
863 // Unlike with toolbars, we always want a border around tabs, so let 860 // Unlike with toolbars, we always want a border around tabs, so let
864 // ThemeService choose the border color if the theme doesn't provide one. 861 // ThemeService choose the border color if the theme doesn't provide one.
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 1091
1095 float GtkUi::GetDeviceScaleFactor() const { 1092 float GtkUi::GetDeviceScaleFactor() const {
1096 return device_scale_factor_; 1093 return device_scale_factor_;
1097 } 1094 }
1098 1095
1099 } // namespace libgtkui 1096 } // namespace libgtkui
1100 1097
1101 views::LinuxUI* BuildGtkUi() { 1098 views::LinuxUI* BuildGtkUi() {
1102 return new libgtkui::GtkUi; 1099 return new libgtkui::GtkUi;
1103 } 1100 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698