| 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/views/frame/browser_desktop_window_tree_host_x11.h" | 5 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" |
| 6 | 6 |
| 7 #include "chrome/browser/themes/theme_service.h" | 7 #include "chrome/browser/themes/theme_service.h" |
| 8 #include "chrome/browser/themes/theme_service_factory.h" | 8 #include "chrome/browser/themes/theme_service_factory.h" |
| 9 #include "chrome/browser/ui/views/frame/browser_frame.h" | 9 #include "chrome/browser/ui/views/frame/browser_frame.h" |
| 10 #include "chrome/browser/ui/views/frame/browser_view.h" | 10 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 11 #include "chrome/browser/ui/views/theme_image_mapper.h" | 11 #include "chrome/browser/ui/views/theme_image_mapper.h" |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 // DesktopThemeProvider maps resource ids using MapThemeImage(). This is | 15 // DesktopThemeProvider maps resource ids using MapThemeImage(). This is |
| 16 // necessary for BrowserDesktopWindowTreeHostWin so that it uses the windows | 16 // necessary for BrowserDesktopWindowTreeHostWin so that it uses the windows |
| 17 // theme images rather than the ash theme images. | 17 // theme images rather than the ash theme images. |
| 18 // | 18 // |
| 19 // This differs from the version in browser_desktop_window_tree_host_win.cc | 19 // This differs from the version in browser_desktop_window_tree_host_win.cc |
| 20 // because we need to also look up whether we're using the native theme. | 20 // because we need to also look up whether we're using the native theme. |
| 21 class DesktopThemeProvider : public ui::ThemeProvider { | 21 class DesktopThemeProvider : public ui::ThemeProvider { |
| 22 public: | 22 public: |
| 23 explicit DesktopThemeProvider(ThemeService* delegate) | 23 explicit DesktopThemeProvider(ThemeService* delegate) |
| 24 : delegate_(delegate) { | 24 : delegate_(delegate) { |
| 25 } | 25 } |
| 26 | 26 |
| 27 bool UsingSystemTheme() const override { | 27 bool UsingSystemTheme() const override { |
| 28 return delegate_->UsingSystemTheme(); | 28 return delegate_->UsingSystemTheme(); |
| 29 } | 29 } |
| 30 ui::NativeTheme* GetNativeTheme(gfx::NativeWindow window) const override { |
| 31 return delegate_->GetNativeTheme(window); |
| 32 } |
| 30 gfx::ImageSkia* GetImageSkiaNamed(int id) const override { | 33 gfx::ImageSkia* GetImageSkiaNamed(int id) const override { |
| 31 if (delegate_->UsingSystemTheme() && delegate_->HasCustomImage(id)) | 34 if (delegate_->UsingSystemTheme() && delegate_->HasCustomImage(id)) |
| 32 return delegate_->GetImageSkiaNamed(id); | 35 return delegate_->GetImageSkiaNamed(id); |
| 33 | 36 |
| 34 return delegate_->GetImageSkiaNamed( | 37 return delegate_->GetImageSkiaNamed( |
| 35 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); | 38 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); |
| 36 } | 39 } |
| 37 SkColor GetColor(int id) const override { return delegate_->GetColor(id); } | 40 SkColor GetColor(int id) const override { return delegate_->GetColor(id); } |
| 38 int GetDisplayProperty(int id) const override { | 41 int GetDisplayProperty(int id) const override { |
| 39 return delegate_->GetDisplayProperty(id); | 42 return delegate_->GetDisplayProperty(id); |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( | 128 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
| 126 views::internal::NativeWidgetDelegate* native_widget_delegate, | 129 views::internal::NativeWidgetDelegate* native_widget_delegate, |
| 127 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 130 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 128 BrowserView* browser_view, | 131 BrowserView* browser_view, |
| 129 BrowserFrame* browser_frame) { | 132 BrowserFrame* browser_frame) { |
| 130 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, | 133 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, |
| 131 desktop_native_widget_aura, | 134 desktop_native_widget_aura, |
| 132 browser_view, | 135 browser_view, |
| 133 browser_frame); | 136 browser_frame); |
| 134 } | 137 } |
| OLD | NEW |