ui/views/examples/content_client/examples_browser_main_parts.cc - Issue 11419013: Add desktop vs. ash context to ui_controls

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/examples/content_client/examples_browser_main_parts.cc

Issue 11419013: Add desktop vs. ash context to ui_controls Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mac typo Created 8 years, 1 month 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/examples/content_client/examples_browser_main_parts.cc

diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc

index 2c371f1a3cd9c7b93c3f4611c59cfca63eb024b4..fb134062a15528831731f857d4a3df51af0c41f7 100644

--- a/ui/views/examples/content_client/examples_browser_main_parts.cc

+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc

@@ -46,6 +46,8 @@ void ExamplesBrowserMainParts::PreMainMessageLoopRun() {

aura::client::SetStackingClient(stacking_client_.get());

gfx::Screen::SetScreenInstance(

gfx::SCREEN_TYPE_NATIVE, CreateDesktopScreen());

+ ui_controls::UIControls::SetUIControlsInstance(

+ ui_controls::UI_CONTROLS_TYPE_NATIVE, CreateDesktopUIControls());

#endif

views_delegate_.reset(new DesktopTestViewsDelegate);