| 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/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 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1161 case IDR_OMNIBOX_TTS: { | 1161 case IDR_OMNIBOX_TTS: { |
| 1162 return GenerateTintedIcon(id, entry_tint_); | 1162 return GenerateTintedIcon(id, entry_tint_); |
| 1163 } | 1163 } |
| 1164 | 1164 |
| 1165 // TODO(erg): The dropdown arrow should be tinted because we're injecting | 1165 // TODO(erg): The dropdown arrow should be tinted because we're injecting |
| 1166 // various background GTK colors, but the code that accesses them needs to | 1166 // various background GTK colors, but the code that accesses them needs to |
| 1167 // be modified so that they ask their ui::ThemeProvider instead of the | 1167 // be modified so that they ask their ui::ThemeProvider instead of the |
| 1168 // ResourceBundle. (i.e. in a light on dark theme, the dropdown arrow will | 1168 // ResourceBundle. (i.e. in a light on dark theme, the dropdown arrow will |
| 1169 // be dark on dark) | 1169 // be dark on dark) |
| 1170 case IDR_MENU_DROPARROW: | 1170 case IDR_MENU_DROPARROW: |
| 1171 case IDR_BROWSER_ACTIONS_OVERFLOW: | |
| 1172 return GenerateTintedIcon(id, button_tint_); | 1171 return GenerateTintedIcon(id, button_tint_); |
| 1173 } | 1172 } |
| 1174 | 1173 |
| 1175 return SkBitmap(); | 1174 return SkBitmap(); |
| 1176 } | 1175 } |
| 1177 | 1176 |
| 1178 SkBitmap Gtk2UI::GenerateFrameImage( | 1177 SkBitmap Gtk2UI::GenerateFrameImage( |
| 1179 int color_id, | 1178 int color_id, |
| 1180 const char* gradient_name) const { | 1179 const char* gradient_name) const { |
| 1181 #if GTK_MAJOR_VERSION == 2 | 1180 #if GTK_MAJOR_VERSION == 2 |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1390 // Blacklist scaling factors <130% (crbug.com/484400) and round | 1389 // Blacklist scaling factors <130% (crbug.com/484400) and round |
| 1391 // to 1 decimal to prevent rendering problems (crbug.com/485183). | 1390 // to 1 decimal to prevent rendering problems (crbug.com/485183). |
| 1392 return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10; | 1391 return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10; |
| 1393 } | 1392 } |
| 1394 | 1393 |
| 1395 } // namespace libgtk2ui | 1394 } // namespace libgtk2ui |
| 1396 | 1395 |
| 1397 views::LinuxUI* BuildGtk2UI() { | 1396 views::LinuxUI* BuildGtk2UI() { |
| 1398 return new libgtk2ui::Gtk2UI; | 1397 return new libgtk2ui::Gtk2UI; |
| 1399 } | 1398 } |
| OLD | NEW |