ui/views/widget/desktop_aura/desktop_native_widget_aura.cc - Issue 273073002: Changes code using Compositor to pass in ContextFactory

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.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:

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

index c5c977af61e355d5e990a3f0e3d8dbc2445ecf3d..6e60bfc615846b1961e631f643ab9dd99ccfb569 100644

--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

@@ -16,6 +16,7 @@

#include "ui/aura/window_tree_host.h"

#include "ui/base/hit_test.h"

#include "ui/base/ui_base_switches_util.h"

+#include "ui/compositor/compositor.h"

#include "ui/compositor/layer.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/display.h"

@@ -29,6 +30,7 @@

#include "ui/views/ime/input_method_bridge.h"

#include "ui/views/ime/null_input_method.h"

#include "ui/views/view_constants_aura.h"

+#include "ui/views/views_delegate.h"

#include "ui/views/widget/desktop_aura/desktop_capture_client.h"

#include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"

#include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"

@@ -415,7 +417,9 @@ void DesktopNativeWidgetAura::InitNativeWidget(

params.desktop_window_tree_host :

DesktopWindowTreeHost::Create(native_widget_delegate_, this);

host_.reset(desktop_window_tree_host_->AsWindowTreeHost());

- desktop_window_tree_host_->Init(content_window_, params);

+ desktop_window_tree_host_->Init(

+ content_window_, params,

+ ViewsDelegate::views_delegate->GetContextFactory());

// Mark this window as Desktop root window.

host_->window()->SetProperty(views::kDesktopRootWindow, true);