| OLD | NEW |
| 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 823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 | 834 |
| 835 colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] = toolbar_text_color; | 835 colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] = toolbar_text_color; |
| 836 | 836 |
| 837 // Tabs use the same background color as the toolbar, so use the | 837 // Tabs use the same background color as the toolbar, so use the |
| 838 // toolbar text color as the tab text color. | 838 // toolbar text color as the tab text color. |
| 839 colors_[ThemeProperties::COLOR_TAB_TEXT] = toolbar_text_color; | 839 colors_[ThemeProperties::COLOR_TAB_TEXT] = toolbar_text_color; |
| 840 colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = toolbar_text_color; | 840 colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = toolbar_text_color; |
| 841 colors_[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] = | 841 colors_[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] = |
| 842 color_utils::BlendTowardOppositeLuma(toolbar_text_color, 50); | 842 color_utils::BlendTowardOppositeLuma(toolbar_text_color, 50); |
| 843 | 843 |
| 844 // Color drawn around the location bar. |
| 845 colors_[ThemeProperties::COLOR_LOCATION_BAR_BORDER] = |
| 846 GetBorderColor("GtkToolbar#toolbar GtkEntry#entry"); |
| 847 |
| 844 inactive_selection_bg_color_ = | 848 inactive_selection_bg_color_ = |
| 845 GetBgColor("GtkEntry#entry:backdrop #selection:selected"); | 849 GetBgColor("GtkEntry#entry:backdrop #selection:selected"); |
| 846 inactive_selection_fg_color_ = | 850 inactive_selection_fg_color_ = |
| 847 GetFgColor("GtkEntry#entry:backdrop #selection:selected"); | 851 GetFgColor("GtkEntry#entry:backdrop #selection:selected"); |
| 848 | 852 |
| 849 SkColor toolbar_separator_horizontal = | 853 SkColor toolbar_separator_horizontal = |
| 850 GetSeparatorColor("GtkToolbar#toolbar GtkSeparator#separator.horizontal"); | 854 GetSeparatorColor("GtkToolbar#toolbar GtkSeparator#separator.horizontal"); |
| 851 SkColor toolbar_separator_vertical = | 855 SkColor toolbar_separator_vertical = |
| 852 GetSeparatorColor("GtkToolbar#toolbar GtkSeparator#separator.vertical"); | 856 GetSeparatorColor("GtkToolbar#toolbar GtkSeparator#separator.vertical"); |
| 853 colors_[ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND] = | 857 colors_[ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND] = |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1043 | 1047 |
| 1044 float GtkUi::GetDeviceScaleFactor() const { | 1048 float GtkUi::GetDeviceScaleFactor() const { |
| 1045 return device_scale_factor_; | 1049 return device_scale_factor_; |
| 1046 } | 1050 } |
| 1047 | 1051 |
| 1048 } // namespace libgtkui | 1052 } // namespace libgtkui |
| 1049 | 1053 |
| 1050 views::LinuxUI* BuildGtkUi() { | 1054 views::LinuxUI* BuildGtkUi() { |
| 1051 return new libgtkui::GtkUi; | 1055 return new libgtkui::GtkUi; |
| 1052 } | 1056 } |
| OLD | NEW |