| 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" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 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 gfx::ImageSkia* GetImageSkiaNamed(int id) const override { | 30 gfx::ImageSkia* GetImageSkiaNamed(int id) const override { |
| 31 if (delegate_->UsingSystemTheme() && delegate_->HasCustomImage(id)) | 31 if (delegate_->UsingSystemTheme() && delegate_->HasCustomImage(id)) |
| 32 return delegate_->GetImageSkiaNamed(id); | 32 return delegate_->GetImageSkiaNamed(id); |
| 33 | 33 |
| 34 return delegate_->GetImageSkiaNamed( | 34 return delegate_->GetImageSkiaNamed( |
| 35 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); | 35 chrome::MapThemeImage(ui::HOST_DESKTOP_TYPE_NATIVE, id)); |
| 36 } | 36 } |
| 37 SkColor GetColor(int id) const override { return delegate_->GetColor(id); } | 37 SkColor GetColor(int id) const override { return delegate_->GetColor(id); } |
| 38 int GetDisplayProperty(int id) const override { | 38 int GetDisplayProperty(int id) const override { |
| 39 return delegate_->GetDisplayProperty(id); | 39 return delegate_->GetDisplayProperty(id); |
| 40 } | 40 } |
| 41 bool ShouldUseNativeFrame() const override { | 41 bool ShouldUseNativeFrame() const override { |
| 42 return delegate_->ShouldUseNativeFrame(); | 42 return delegate_->ShouldUseNativeFrame(); |
| 43 } | 43 } |
| 44 bool HasCustomImage(int id) const override { | 44 bool HasCustomImage(int id) const override { |
| 45 return delegate_->HasCustomImage( | 45 return delegate_->HasCustomImage( |
| 46 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); | 46 chrome::MapThemeImage(ui::HOST_DESKTOP_TYPE_NATIVE, id)); |
| 47 } | 47 } |
| 48 base::RefCountedMemory* GetRawData(int id, ui::ScaleFactor scale_factor) | 48 base::RefCountedMemory* GetRawData(int id, ui::ScaleFactor scale_factor) |
| 49 const override { | 49 const override { |
| 50 return delegate_->GetRawData(id, scale_factor); | 50 return delegate_->GetRawData(id, scale_factor); |
| 51 } | 51 } |
| 52 | 52 |
| 53 private: | 53 private: |
| 54 ThemeService* delegate_; | 54 ThemeService* delegate_; |
| 55 | 55 |
| 56 DISALLOW_COPY_AND_ASSIGN(DesktopThemeProvider); | 56 DISALLOW_COPY_AND_ASSIGN(DesktopThemeProvider); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( | 125 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
| 126 views::internal::NativeWidgetDelegate* native_widget_delegate, | 126 views::internal::NativeWidgetDelegate* native_widget_delegate, |
| 127 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 127 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 128 BrowserView* browser_view, | 128 BrowserView* browser_view, |
| 129 BrowserFrame* browser_frame) { | 129 BrowserFrame* browser_frame) { |
| 130 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, | 130 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, |
| 131 desktop_native_widget_aura, | 131 desktop_native_widget_aura, |
| 132 browser_view, | 132 browser_view, |
| 133 browser_frame); | 133 browser_frame); |
| 134 } | 134 } |
| OLD | NEW |