| 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 <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/leak_annotations.h" | 10 #include "base/debug/leak_annotations.h" |
| (...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1028 | 1028 |
| 1029 SkBitmap Gtk2UI::GenerateGtkThemeBitmap(int id) const { | 1029 SkBitmap Gtk2UI::GenerateGtkThemeBitmap(int id) const { |
| 1030 switch (id) { | 1030 switch (id) { |
| 1031 case IDR_THEME_TOOLBAR: { | 1031 case IDR_THEME_TOOLBAR: { |
| 1032 GtkStyle* style = gtk_rc_get_style(fake_window_); | 1032 GtkStyle* style = gtk_rc_get_style(fake_window_); |
| 1033 GdkColor* color = &style->bg[GTK_STATE_NORMAL]; | 1033 GdkColor* color = &style->bg[GTK_STATE_NORMAL]; |
| 1034 SkBitmap bitmap; | 1034 SkBitmap bitmap; |
| 1035 bitmap.setConfig(SkBitmap::kARGB_8888_Config, | 1035 bitmap.setConfig(SkBitmap::kARGB_8888_Config, |
| 1036 kToolbarImageWidth, kToolbarImageHeight); | 1036 kToolbarImageWidth, kToolbarImageHeight); |
| 1037 bitmap.allocPixels(); | 1037 bitmap.allocPixels(); |
| 1038 bitmap.eraseRGB(color->red >> 8, color->green >> 8, color->blue >> 8); | 1038 bitmap.eraseARGB(0xff, color->red >> 8, color->green >> 8, |
| 1039 color->blue >> 8); |
| 1039 return bitmap; | 1040 return bitmap; |
| 1040 } | 1041 } |
| 1041 case IDR_THEME_TAB_BACKGROUND: | 1042 case IDR_THEME_TAB_BACKGROUND: |
| 1042 return GenerateTabImage(IDR_THEME_FRAME); | 1043 return GenerateTabImage(IDR_THEME_FRAME); |
| 1043 case IDR_THEME_TAB_BACKGROUND_INCOGNITO: | 1044 case IDR_THEME_TAB_BACKGROUND_INCOGNITO: |
| 1044 return GenerateTabImage(IDR_THEME_FRAME_INCOGNITO); | 1045 return GenerateTabImage(IDR_THEME_FRAME_INCOGNITO); |
| 1045 case IDR_FRAME: | 1046 case IDR_FRAME: |
| 1046 case IDR_THEME_FRAME: | 1047 case IDR_THEME_FRAME: |
| 1047 return GenerateFrameImage(ThemeProperties::COLOR_FRAME, | 1048 return GenerateFrameImage(ThemeProperties::COLOR_FRAME, |
| 1048 "frame-gradient-color"); | 1049 "frame-gradient-color"); |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1382 ClearAllThemeData(); | 1383 ClearAllThemeData(); |
| 1383 LoadGtkValues(); | 1384 LoadGtkValues(); |
| 1384 NativeThemeGtk2::instance()->NotifyNativeThemeObservers(); | 1385 NativeThemeGtk2::instance()->NotifyNativeThemeObservers(); |
| 1385 } | 1386 } |
| 1386 | 1387 |
| 1387 } // namespace libgtk2ui | 1388 } // namespace libgtk2ui |
| 1388 | 1389 |
| 1389 views::LinuxUI* BuildGtk2UI() { | 1390 views::LinuxUI* BuildGtk2UI() { |
| 1390 return new libgtk2ui::Gtk2UI; | 1391 return new libgtk2ui::Gtk2UI; |
| 1391 } | 1392 } |
| OLD | NEW |