ui/aura_shell/default_container_layout_manager.cc - Issue 8598031: views: Move widget/ directory to ui/views.

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_shell/default_container_layout_manager.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: reland for real Created 9 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/aura_shell/default_container_layout_manager.cc

diff --git a/ui/aura_shell/default_container_layout_manager.cc b/ui/aura_shell/default_container_layout_manager.cc

index 8deb9fb258a81258e41eba4095f4973dc714866c..6e80d4910cbf318ad51b9d9e801d7eb46280f069 100644

--- a/ui/aura_shell/default_container_layout_manager.cc

+++ b/ui/aura_shell/default_container_layout_manager.cc

@@ -7,17 +7,17 @@

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

#include "ui/aura/desktop.h"

#include "ui/aura/event.h"

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

#include "ui/aura/screen_aura.h"

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

+#include "ui/aura/window.h"

#include "ui/aura/window_observer.h"

+#include "ui/aura/window_types.h"

#include "ui/aura_shell/property_util.h"

#include "ui/aura_shell/show_state_controller.h"

#include "ui/aura_shell/workspace/workspace.h"

#include "ui/aura_shell/workspace/workspace_manager.h"

#include "ui/base/ui_base_types.h"

#include "ui/gfx/rect.h"

-#include "views/widget/native_widget_aura.h"

+#include "ui/views/widget/native_widget_aura.h"

namespace aura_shell {

namespace internal {

« no previous file with comments | « ui/aura_shell/app_list.h ('k') | ui/aura_shell/default_container_layout_manager_unittest.cc » ('j') | no next file with comments »