ui/views/widget/desktop_aura/desktop_root_window_host_win.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/views/widget/desktop_aura/desktop_root_window_host_win.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/views/widget/desktop_aura/desktop_root_window_host_win.cc

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

--- ui/views/widget/desktop_aura/desktop_root_window_host_win.cc (revision 176470)

+++ ui/views/widget/desktop_aura/desktop_root_window_host_win.cc (working copy)

@@ -10,7 +10,6 @@

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

#include "ui/aura/focus_manager.h"

#include "ui/aura/root_window.h"

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

#include "ui/aura/window_property.h"

#include "ui/base/cursor/cursor_loader_win.h"

#include "ui/base/ime/input_method_win.h"

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

#include "ui/gfx/path_win.h"

#include "ui/native_theme/native_theme_aura.h"

#include "ui/native_theme/native_theme_win.h"

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

#include "ui/views/corewm/compound_event_filter.h"

#include "ui/views/corewm/input_method_event_filter.h"

#include "ui/views/ime/input_method_bridge.h"

@@ -145,7 +143,6 @@

focus_client_->FocusWindow(content_window_);

root_window_->SetProperty(kContentWindowForRootWindow, content_window_);

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

return root_window_;

}

« no previous file with comments | « ui/ui_controls/ui_controls_internal_win.h ('k') | no next file » | no next file with comments »