| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 66 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 67 BrowserView* browser_view, | 67 BrowserView* browser_view, |
| 68 BrowserFrame* browser_frame) | 68 BrowserFrame* browser_frame) |
| 69 : DesktopWindowTreeHostX11(native_widget_delegate, | 69 : DesktopWindowTreeHostX11(native_widget_delegate, |
| 70 desktop_native_widget_aura), | 70 desktop_native_widget_aura), |
| 71 browser_view_(browser_view) { | 71 browser_view_(browser_view) { |
| 72 scoped_ptr<ui::ThemeProvider> theme_provider( | 72 scoped_ptr<ui::ThemeProvider> theme_provider( |
| 73 new DesktopThemeProvider(ThemeServiceFactory::GetForProfile( | 73 new DesktopThemeProvider(ThemeServiceFactory::GetForProfile( |
| 74 browser_view->browser()->profile()))); | 74 browser_view->browser()->profile()))); |
| 75 browser_frame->SetThemeProvider(theme_provider.Pass()); | 75 browser_frame->SetThemeProvider(theme_provider.Pass()); |
| 76 browser_frame->set_frame_type( |
| 77 browser_frame->UseCustomFrame() ? views::Widget::FRAME_TYPE_FORCE_CUSTOM |
| 78 : views::Widget::FRAME_TYPE_FORCE_NATIVE); |
| 76 } | 79 } |
| 77 | 80 |
| 78 BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() { | 81 BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() { |
| 79 } | 82 } |
| 80 | 83 |
| 81 //////////////////////////////////////////////////////////////////////////////// | 84 //////////////////////////////////////////////////////////////////////////////// |
| 82 // BrowserDesktopWindowTreeHostX11, | 85 // BrowserDesktopWindowTreeHostX11, |
| 83 // BrowserDesktopWindowTreeHost implementation: | 86 // BrowserDesktopWindowTreeHost implementation: |
| 84 | 87 |
| 85 views::DesktopWindowTreeHost* | 88 views::DesktopWindowTreeHost* |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( | 125 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
| 123 views::internal::NativeWidgetDelegate* native_widget_delegate, | 126 views::internal::NativeWidgetDelegate* native_widget_delegate, |
| 124 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 127 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 125 BrowserView* browser_view, | 128 BrowserView* browser_view, |
| 126 BrowserFrame* browser_frame) { | 129 BrowserFrame* browser_frame) { |
| 127 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, | 130 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, |
| 128 desktop_native_widget_aura, | 131 desktop_native_widget_aura, |
| 129 browser_view, | 132 browser_view, |
| 130 browser_frame); | 133 browser_frame); |
| 131 } | 134 } |
| OLD | NEW |