content/shell/browser/shell_platform_data_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: content/shell/browser/shell_platform_data_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: content/shell/browser/shell_platform_data_aura.cc

diff --git a/content/shell/browser/shell_platform_data_aura.cc b/content/shell/browser/shell_platform_data_aura.cc

index 33b8073ba7be633573817b4a7eb455194fc6438f..95ab919ca228e1d4242d73ec4f97407264711000 100644

--- a/content/shell/browser/shell_platform_data_aura.cc

+++ b/content/shell/browser/shell_platform_data_aura.cc

@@ -4,6 +4,7 @@

#include "content/shell/browser/shell_platform_data_aura.h"

+#include "content/public/browser/context_factory.h"

#include "content/shell/browser/shell.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/client/default_capture_client.h"

@@ -114,7 +115,8 @@ ShellPlatformDataAura* Shell::platform_ = NULL;

ShellPlatformDataAura::ShellPlatformDataAura(const gfx::Size& initial_size) {

CHECK(aura::Env::GetInstance());

- host_.reset(aura::WindowTreeHost::Create(gfx::Rect(initial_size)));

+ host_.reset(aura::WindowTreeHost::Create(gfx::Rect(initial_size),

+ GetContextFactory()));

host_->InitHost();

host_->window()->SetLayoutManager(new FillLayout(host_->window()));

« no previous file with comments | « content/public/test/test_renderer_host.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »