ash/shell.h - 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: ash/shell.h

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: ash/shell.h

diff --git a/ash/shell.h b/ash/shell.h

index e889131b95beca21793ddde3e57a98c6cf693080..313594935cb0d52f2ea6e186a4d3283db5da4795 100644

--- a/ash/shell.h

+++ b/ash/shell.h

@@ -49,6 +49,7 @@ class Rect;

}

namespace ui {

+class ContextFactory;

class DisplayConfigurator;

class Layer;

class UserActivityPowerManagerNotifier;

@@ -579,7 +580,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,

typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;

// Takes ownership of |delegate|.

- explicit Shell(ShellDelegate* delegate);

+ Shell(ShellDelegate* delegate, ui::ContextFactory* context_factory);

virtual ~Shell();

void Init(const ShellInitParams& init_params);

« no previous file with comments | « ash/host/ash_window_tree_host_x11_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »