ui/aura_shell/launcher/launcher_view.cc - Issue 8572016: views: Move more two directories into 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/launcher/launcher_view.cc

Issue 8572016: views: Move more two directories into ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/launcher/launcher_view.cc

diff --git a/ui/aura_shell/launcher/launcher_view.cc b/ui/aura_shell/launcher/launcher_view.cc

index 6d22e5ae591854d2c022a551402df4aec6be7d20..b6fb445753e4296af08b7d4ad074749daf4ec28c 100644

--- a/ui/aura_shell/launcher/launcher_view.cc

+++ b/ui/aura_shell/launcher/launcher_view.cc

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

#include "base/utf_string_conversions.h"

#include "grit/ui_resources.h"

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

#include "ui/aura_shell/launcher/app_launcher_button.h"

#include "ui/aura_shell/launcher/launcher_model.h"

#include "ui/aura_shell/launcher/tabbed_launcher_button.h"

@@ -13,14 +14,13 @@

#include "ui/aura_shell/launcher/view_model_utils.h"

#include "ui/aura_shell/shell.h"

#include "ui/aura_shell/shell_delegate.h"

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

#include "ui/base/animation/animation.h"

#include "ui/base/animation/throb_animation.h"

#include "ui/base/models/simple_menu_model.h"

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

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

#include "ui/gfx/image/image.h"

-#include "views/animation/bounds_animator.h"

+#include "ui/views/animation/bounds_animator.h"

#include "views/controls/button/image_button.h"

#include "views/controls/menu/menu_model_adapter.h"

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

« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab_strip.h ('k') | ui/views/animation/bounds_animator.h » ('j') | no next file with comments »