ash/system/tray/system_tray.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/system/tray/system_tray.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:

View side-by-side diff with in-line comments

Download patch

Index: ash/system/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index c7f66e9e641a3cea4a303ba1b9037653c5d4f265..22508af30ec5fd85067f43a02591846bb86ce8aa 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

@@ -18,16 +18,16 @@

#include "ash/system/power/power_supply_status.h"

#include "ash/system/power/tray_power.h"

#include "ash/system/settings/tray_settings.h"

-#include "ash/system/tray/tray_empty.h"

-#include "ash/system/tray/tray_constants.h"

#include "ash/system/tray/system_tray_delegate.h"

#include "ash/system/tray/system_tray_item.h"

#include "ash/system/tray/system_tray_widget_delegate.h"

+#include "ash/system/tray/tray_constants.h"

+#include "ash/system/tray/tray_empty.h"

#include "ash/system/tray_accessibility.h"

#include "ash/system/tray_caps_lock.h"

#include "ash/system/tray_update.h"

-#include "ash/system/user/tray_user.h"

#include "ash/system/user/login_status.h"

+#include "ash/system/user/tray_user.h"

#include "ash/wm/shadow_types.h"

#include "ash/wm/shelf_layout_manager.h"

#include "ash/wm/window_animations.h"

@@ -44,11 +44,11 @@

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

#include "third_party/skia/include/effects/SkBlurImageFilter.h"

#include "ui/aura/root_window.h"

-#include "ui/base/events.h"

#include "ui/base/accessibility/accessible_view_state.h"

+#include "ui/base/events.h"

#include "ui/base/l10n/l10n_util.h"

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

#include "ui/gfx/canvas.h"

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

#include "ui/gfx/screen.h"

#include "ui/gfx/skia_util.h"

#include "ui/views/border.h"

@@ -56,8 +56,8 @@

#include "ui/views/bubble/bubble_delegate.h"

#include "ui/views/bubble/bubble_frame_view.h"

#include "ui/views/controls/label.h"

-#include "ui/views/layout/fill_layout.h"

#include "ui/views/layout/box_layout.h"

+#include "ui/views/layout/fill_layout.h"

#include "ui/views/view.h"

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

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