Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tooltip on chromeos Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 82ad88a204e428432f3bbf43e73572eac369b064..a5e9ad09d6425dcd6569e4ae0dff5d7af452f78e 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -118,7 +118,8 @@ ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) {
// DesktopWindowTreeHostWin, DesktopWindowTreeHost implementation:
void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
- const Widget::InitParams& params) {
+ const Widget::InitParams& params,
+ ui::ContextFactory* context_factory) {
// TODO(beng): SetInitParams().
content_window_ = content_window;
@@ -143,7 +144,7 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
kForceSoftwareCompositor,
reinterpret_cast<HANDLE>(true));
}
- CreateCompositor(GetAcceleratedWidget());
+ CreateCompositor(GetAcceleratedWidget(), context_factory);
}
void DesktopWindowTreeHostWin::OnNativeWidgetCreated(

Powered by Google App Engine
This is Rietveld 408576698