ui/aura/demo/demo_main.cc - Issue 7886042: Move Aura to UI subdir.

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/demo/demo_main.cc

Issue 7886042: Move Aura to UI subdir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

Index: ui/aura/demo/demo_main.cc

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

--- ui/aura/demo/demo_main.cc (revision 100961)

+++ ui/aura/demo/demo_main.cc (working copy)

@@ -2,24 +2,24 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "aura/desktop.h"

-#include "aura/event.h"

-#include "aura/window.h"

-#include "aura/window_delegate.h"

#include "base/at_exit.h"

#include "base/command_line.h"

#include "base/i18n/icu_util.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

#include "third_party/skia/include/core/SkXfermode.h"

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

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

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

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

#include "ui/gfx/canvas_skia.h"

#include "ui/gfx/rect.h"

#if defined(USE_X11)

-#include "aura/hit_test.h"

#include "base/message_pump_x.h"

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

#endif

namespace {