ash/system/web_notification/web_notification_tray.cc - Issue 12313118: Refactor: Shelf Widget

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/web_notification/web_notification_tray.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: formatting and moved a couple unit tests Created 7 years, 10 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/system/web_notification/web_notification_tray.cc

diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc

index 32876d8bccd1a4ac13769d2b1467cbbffc5c4b5e..086ff75fb0dce1e0a950d92b71bdcc6965b7e973 100644

--- a/ash/system/web_notification/web_notification_tray.cc

+++ b/ash/system/web_notification/web_notification_tray.cc

@@ -5,13 +5,16 @@

#include "ash/system/web_notification/web_notification_tray.h"

#include "ash/root_window_controller.h"

+#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

#include "ash/system/status_area_widget.h"

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

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

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

-#include "ash/wm/shelf_layout_manager.h"

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

+#include "base/message_loop.h"

+#include "base/stringprintf.h"

#include "grit/ash_resources.h"

#include "grit/ash_strings.h"

#include "ui/aura/root_window.h"