ui/aura/test/aura_test_helper.cc - Issue 11878013: Make ui_controls only usable from interactive_ui_tests. This has two benefits:

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/aura/test/aura_test_helper.cc

Issue 11878013: Make ui_controls only usable from interactive_ui_tests. This has two benefits: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 11 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:

View side-by-side diff with in-line comments

Download patch

Index: ui/aura/test/aura_test_helper.cc

===================================================================

--- ui/aura/test/aura_test_helper.cc (revision 176470)

+++ ui/aura/test/aura_test_helper.cc (working copy)

@@ -15,11 +15,9 @@

#include "ui/aura/test/test_activation_client.h"

#include "ui/aura/test/test_screen.h"

#include "ui/aura/test/test_stacking_client.h"

-#include "ui/aura/ui_controls_aura.h"

#include "ui/base/test/dummy_input_method.h"

#include "ui/compositor/layer_animator.h"

#include "ui/gfx/screen.h"

-#include "ui/ui_controls/ui_controls.h"

namespace aura {

namespace test {

@@ -47,7 +45,6 @@

test_screen_.reset(new TestScreen());

gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());

root_window_.reset(test_screen_->CreateRootWindowForPrimaryDisplay());

- ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));

focus_client_.reset(new FocusManager);

client::SetFocusClient(root_window_.get(), focus_client_.get());

« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/ui_controls_aura.h » ('j') | no next file with comments »