| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/themes/theme_service_aurax11.h" | 5 #include "chrome/browser/themes/theme_service_aurax11.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/themes/custom_theme_supplier.h" | 10 #include "chrome/browser/themes/custom_theme_supplier.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 bool SystemThemeX11::GetTint(int id, color_utils::HSL* hsl) const { | 59 bool SystemThemeX11::GetTint(int id, color_utils::HSL* hsl) const { |
| 60 return linux_ui_ && linux_ui_->GetTint(id, hsl); | 60 return linux_ui_ && linux_ui_->GetTint(id, hsl); |
| 61 } | 61 } |
| 62 | 62 |
| 63 bool SystemThemeX11::GetColor(int id, SkColor* color) const { | 63 bool SystemThemeX11::GetColor(int id, SkColor* color) const { |
| 64 return linux_ui_ && linux_ui_->GetColor(id, color); | 64 return linux_ui_ && linux_ui_->GetColor(id, color); |
| 65 } | 65 } |
| 66 | 66 |
| 67 gfx::Image SystemThemeX11::GetImageNamed(int id) { | 67 gfx::Image SystemThemeX11::GetImageNamed(int id) { |
| 68 return linux_ui_ ? linux_ui_->GetThemeImageNamed(id) : gfx::Image(); | 68 return gfx::Image(); |
| 69 } | 69 } |
| 70 | 70 |
| 71 bool SystemThemeX11::HasCustomImage(int id) const { | 71 bool SystemThemeX11::HasCustomImage(int id) const { |
| 72 return linux_ui_ && linux_ui_->HasCustomImage(id); | 72 return false; |
| 73 } | 73 } |
| 74 | 74 |
| 75 SystemThemeX11::~SystemThemeX11() {} | 75 SystemThemeX11::~SystemThemeX11() {} |
| 76 | 76 |
| 77 } // namespace | 77 } // namespace |
| 78 | 78 |
| 79 ThemeServiceAuraX11::ThemeServiceAuraX11() {} | 79 ThemeServiceAuraX11::ThemeServiceAuraX11() {} |
| 80 | 80 |
| 81 ThemeServiceAuraX11::~ThemeServiceAuraX11() {} | 81 ThemeServiceAuraX11::~ThemeServiceAuraX11() {} |
| 82 | 82 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 94 | 94 |
| 95 bool ThemeServiceAuraX11::UsingDefaultTheme() const { | 95 bool ThemeServiceAuraX11::UsingDefaultTheme() const { |
| 96 return ThemeService::UsingDefaultTheme() && !UsingSystemTheme(); | 96 return ThemeService::UsingDefaultTheme() && !UsingSystemTheme(); |
| 97 } | 97 } |
| 98 | 98 |
| 99 bool ThemeServiceAuraX11::UsingSystemTheme() const { | 99 bool ThemeServiceAuraX11::UsingSystemTheme() const { |
| 100 const CustomThemeSupplier* theme_supplier = get_theme_supplier(); | 100 const CustomThemeSupplier* theme_supplier = get_theme_supplier(); |
| 101 return theme_supplier && | 101 return theme_supplier && |
| 102 theme_supplier->get_theme_type() == CustomThemeSupplier::NATIVE_X11; | 102 theme_supplier->get_theme_type() == CustomThemeSupplier::NATIVE_X11; |
| 103 } | 103 } |
| OLD | NEW |