ui/views/widget/desktop_aura/desktop_native_widget_aura.cc - Issue 194843004: Move files from ui/views/corewm to ui/wm/core

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_native_widget_aura.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 9 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

« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_cursor_manager.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

index 365f6db7187ea1c1f79013ba6ed92e892153de46..cb54b8f776f854d2b46a1380bf1342d882e7d2d1 100644

--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

@@ -25,18 +25,8 @@

#include "ui/gfx/screen.h"

#include "ui/gfx/size_conversions.h"

#include "ui/native_theme/native_theme.h"

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

-#include "ui/views/corewm/corewm_switches.h"

-#include "ui/views/corewm/cursor_manager.h"

-#include "ui/views/corewm/focus_controller.h"

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

-#include "ui/views/corewm/native_cursor_manager.h"

-#include "ui/views/corewm/shadow_controller.h"

-#include "ui/views/corewm/shadow_types.h"

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

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

-#include "ui/views/corewm/visibility_controller.h"

-#include "ui/views/corewm/window_modality_controller.h"

#include "ui/views/drag_utils.h"

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

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

@@ -57,6 +47,15 @@

#include "ui/views/widget/widget_aura_utils.h"

#include "ui/views/widget/widget_delegate.h"

#include "ui/views/widget/window_reorderer.h"

+#include "ui/wm/core/compound_event_filter.h"

+#include "ui/wm/core/cursor_manager.h"

+#include "ui/wm/core/focus_controller.h"

+#include "ui/wm/core/input_method_event_filter.h"

+#include "ui/wm/core/native_cursor_manager.h"

+#include "ui/wm/core/shadow_controller.h"

+#include "ui/wm/core/shadow_types.h"

+#include "ui/wm/core/visibility_controller.h"

+#include "ui/wm/core/window_modality_controller.h"

#if defined(OS_WIN)

#include "ui/base/win/shell.h"