ash/shell/window_type_launcher.cc - Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/.

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: ash/shell/window_type_launcher.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix DEPS Created 8 years, 8 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: ash/shell/window_type_launcher.cc

diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc

index f3abad27a6fe7b610dbd7d4fbb2d20bcb13e5a31..27d1d9019a0ba9783fcad4df03fd52378ca48140 100644

--- a/ash/shell/window_type_launcher.cc

+++ b/ash/shell/window_type_launcher.cc

@@ -5,17 +5,17 @@

#include "ash/shell/window_type_launcher.h"

#include "ash/shell.h"

-#include "ash/shell_delegate.h"

-#include "ash/shell_window_ids.h"

#include "ash/shell/example_factory.h"

#include "ash/shell/panel_window.h"

#include "ash/shell/toplevel_window.h"

+#include "ash/shell_delegate.h"

+#include "ash/shell_window_ids.h"

#include "ash/wm/shadow_types.h"

#include "base/utf_string_conversions.h"

#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

+#include "ui/compositor/layer.h"

#include "ui/gfx/canvas.h"

-#include "ui/gfx/compositor/layer.h"

#include "ui/views/controls/button/text_button.h"

#include "ui/views/controls/menu/menu_item_view.h"

#include "ui/views/controls/menu/menu_runner.h"

« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »