chrome/browser/ui/ash/ash_init.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: chrome/browser/ui/ash/ash_init.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: chrome/browser/ui/ash/ash_init.cc

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc

index 06ab94e5d77c0d06ef37e901b61e966043b1e3fa..78e617b9c0ad23c98f3f79c145c76260ff6e4473 100644

--- a/chrome/browser/ui/ash/ash_init.cc

+++ b/chrome/browser/ui/ash/ash_init.cc

@@ -19,6 +19,7 @@

#include "chrome/browser/ui/ash/screenshot_taker.h"

#include "chrome/common/chrome_switches.h"

#include "content/public/browser/browser_thread.h"

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

#include "ui/aura/env.h"

#include "ui/aura/window_tree_host.h"

@@ -62,6 +63,7 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {

ash::ShellInitParams shell_init_params;

// Shell takes ownership of ChromeShellDelegate.

shell_init_params.delegate = new ChromeShellDelegate;

+ shell_init_params.context_factory = content::GetContextFactory();

#if defined(OS_WIN)

shell_init_params.remote_hwnd = remote_window;

#endif